annotate idavoll/test/test_storage.py @ 216:53d2c0019458

Fix subscription and unsubscription JID checks.
author Ralph Meijer <ralphm@ik.nu>
date Thu, 03 Sep 2009 16:27:32 +0000
parents 274a45d2a5ab
children bb7103da9879
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
171
bc269696ef42 Reply with the correct error condition on subscription when not subscribed.
Ralph Meijer <ralphm@ik.nu>
parents: 167
diff changeset
1 # Copyright (c) 2003-2008 Ralph Meijer
155
5191ba7c4df8 Work towards first release 0.5.0.
Ralph Meijer <ralphm@ik.nu>
parents: 146
diff changeset
2 # See LICENSE for details.
5191ba7c4df8 Work towards first release 0.5.0.
Ralph Meijer <ralphm@ik.nu>
parents: 146
diff changeset
3
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
4 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
5 Tests for L{idavoll.memory_storage} and L{idavoll.pgsql_storage}.
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
6 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
7
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
8 from zope.interface.verify import verifyObject
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
9 from twisted.trial import unittest
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
10 from twisted.words.protocols.jabber import jid
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
11 from twisted.internet import defer
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
12 from twisted.words.xish import domish
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
13
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
14 from wokkel import pubsub
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
15
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
16 from idavoll import error, iidavoll
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
17
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
18 OWNER = jid.JID('owner@example.com')
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
19 SUBSCRIBER = jid.JID('subscriber@example.com/Home')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
20 SUBSCRIBER_NEW = jid.JID('new@example.com/Home')
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
21 SUBSCRIBER_TO_BE_DELETED = jid.JID('to_be_deleted@example.com/Home')
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
22 SUBSCRIBER_PENDING = jid.JID('pending@example.com/Home')
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
23 PUBLISHER = jid.JID('publisher@example.com')
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
24 ITEM = domish.Element((None, 'item'))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
25 ITEM['id'] = 'current'
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
26 ITEM.addElement(('testns', 'test'), content=u'Test \u2083 item')
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
27 ITEM_NEW = domish.Element((None, 'item'))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
28 ITEM_NEW['id'] = 'new'
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
29 ITEM_NEW.addElement(('testns', 'test'), content=u'Test \u2083 item')
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
30 ITEM_UPDATED = domish.Element((None, 'item'))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
31 ITEM_UPDATED['id'] = 'current'
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
32 ITEM_UPDATED.addElement(('testns', 'test'), content=u'Test \u2084 item')
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
33 ITEM_TO_BE_DELETED = domish.Element((None, 'item'))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
34 ITEM_TO_BE_DELETED['id'] = 'to-be-deleted'
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
35 ITEM_TO_BE_DELETED.addElement(('testns', 'test'), content=u'Test \u2083 item')
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
36
139
8f6956b9a688 Follow API change in Twisted Xish, while still being compatible with
Ralph Meijer <ralphm@ik.nu>
parents: 138
diff changeset
37 def decode(object):
8f6956b9a688 Follow API change in Twisted Xish, while still being compatible with
Ralph Meijer <ralphm@ik.nu>
parents: 138
diff changeset
38 if isinstance(object, str):
8f6956b9a688 Follow API change in Twisted Xish, while still being compatible with
Ralph Meijer <ralphm@ik.nu>
parents: 138
diff changeset
39 object = object.decode('utf-8')
8f6956b9a688 Follow API change in Twisted Xish, while still being compatible with
Ralph Meijer <ralphm@ik.nu>
parents: 138
diff changeset
40 return object
8f6956b9a688 Follow API change in Twisted Xish, while still being compatible with
Ralph Meijer <ralphm@ik.nu>
parents: 138
diff changeset
41
171
bc269696ef42 Reply with the correct error condition on subscription when not subscribed.
Ralph Meijer <ralphm@ik.nu>
parents: 167
diff changeset
42
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
43
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
44 class StorageTests:
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
45
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
46 def _assignTestNode(self, node):
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
47 self.node = node
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
48
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
49
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
50 def setUp(self):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
51 d = self.s.getNode('pre-existing')
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
52 d.addCallback(self._assignTestNode)
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
53 return d
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
54
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
55
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
56 def test_interfaceIStorage(self):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
57 self.assertTrue(verifyObject(iidavoll.IStorage, self.s))
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
58
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
59
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
60 def test_interfaceINode(self):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
61 self.assertTrue(verifyObject(iidavoll.INode, self.node))
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
62
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
63
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
64 def test_interfaceILeafNode(self):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
65 self.assertTrue(verifyObject(iidavoll.ILeafNode, self.node))
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
66
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
67
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
68 def test_getNode(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
69 return self.s.getNode('pre-existing')
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
70
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
71
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
72 def test_getNonExistingNode(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
73 d = self.s.getNode('non-existing')
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
74 self.assertFailure(d, error.NodeNotFound)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
75 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
76
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
77
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
78 def test_getNodeIDs(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
79 def cb(nodeIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
80 self.assertIn('pre-existing', nodeIdentifiers)
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
81 self.assertNotIn('non-existing', nodeIdentifiers)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
82
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
83 return self.s.getNodeIds().addCallback(cb)
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
84
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
85
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
86 def test_createExistingNode(self):
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
87 config = self.s.getDefaultConfiguration('leaf')
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
88 config['pubsub#node_type'] = 'leaf'
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
89 d = self.s.createNode('pre-existing', OWNER, config)
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
90 self.assertFailure(d, error.NodeExists)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
91 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
92
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
93
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
94 def test_createNode(self):
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
95 def cb(void):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
96 d = self.s.getNode('new 1')
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
97 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
98
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
99 config = self.s.getDefaultConfiguration('leaf')
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
100 config['pubsub#node_type'] = 'leaf'
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
101 d = self.s.createNode('new 1', OWNER, config)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
102 d.addCallback(cb)
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
103 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
104
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
105
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
106 def test_deleteNonExistingNode(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
107 d = self.s.deleteNode('non-existing')
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
108 self.assertFailure(d, error.NodeNotFound)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
109 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
110
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
111
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
112 def test_deleteNode(self):
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
113 def cb(void):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
114 d = self.s.getNode('to-be-deleted')
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
115 self.assertFailure(d, error.NodeNotFound)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
116 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
117
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
118 d = self.s.deleteNode('to-be-deleted')
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
119 d.addCallback(cb)
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
120 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
121
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
122
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
123 def test_getAffiliations(self):
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
124 def cb(affiliations):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
125 self.assertIn(('pre-existing', 'owner'), affiliations)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
126
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
127 d = self.s.getAffiliations(OWNER)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
128 d.addCallback(cb)
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
129 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
130
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
131
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
132 def test_getSubscriptions(self):
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
133 def cb(subscriptions):
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
134 found = False
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
135 for subscription in subscriptions:
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
136 if (subscription.nodeIdentifier == 'pre-existing' and
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
137 subscription.subscriber == SUBSCRIBER and
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
138 subscription.state == 'subscribed'):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
139 found = True
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
140 self.assertTrue(found)
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
141
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
142 d = self.s.getSubscriptions(SUBSCRIBER)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
143 d.addCallback(cb)
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
144 return d
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
145
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
146
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
147 # Node tests
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
148
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
149 def test_getType(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
150 self.assertEqual(self.node.getType(), 'leaf')
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
151
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
152
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
153 def test_getConfiguration(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
154 config = self.node.getConfiguration()
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
155 self.assertIn('pubsub#persist_items', config.iterkeys())
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
156 self.assertIn('pubsub#deliver_payloads', config.iterkeys())
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
157 self.assertEqual(config['pubsub#persist_items'], True)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
158 self.assertEqual(config['pubsub#deliver_payloads'], True)
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
159
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
160
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
161 def test_setConfiguration(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
162 def getConfig(node):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
163 d = node.setConfiguration({'pubsub#persist_items': False})
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
164 d.addCallback(lambda _: node)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
165 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
166
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
167 def checkObjectConfig(node):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
168 config = node.getConfiguration()
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
169 self.assertEqual(config['pubsub#persist_items'], False)
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
170
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
171 def getNode(void):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
172 return self.s.getNode('to-be-reconfigured')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
173
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
174 def checkStorageConfig(node):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
175 config = node.getConfiguration()
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
176 self.assertEqual(config['pubsub#persist_items'], False)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
177
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
178 d = self.s.getNode('to-be-reconfigured')
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
179 d.addCallback(getConfig)
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
180 d.addCallback(checkObjectConfig)
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
181 d.addCallback(getNode)
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
182 d.addCallback(checkStorageConfig)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
183 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
184
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
185
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
186 def test_getMetaData(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
187 metaData = self.node.getMetaData()
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
188 for key, value in self.node.getConfiguration().iteritems():
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
189 self.assertIn(key, metaData.iterkeys())
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
190 self.assertEqual(value, metaData[key])
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
191 self.assertIn('pubsub#node_type', metaData.iterkeys())
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
192 self.assertEqual(metaData['pubsub#node_type'], 'leaf')
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
193
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
194
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
195 def test_getAffiliation(self):
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
196 def cb(affiliation):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
197 self.assertEqual(affiliation, 'owner')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
198
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
199 d = self.node.getAffiliation(OWNER)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
200 d.addCallback(cb)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
201 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
202
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
203
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
204 def test_getNonExistingAffiliation(self):
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
205 def cb(affiliation):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
206 self.assertEqual(affiliation, None)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
207
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
208 d = self.node.getAffiliation(SUBSCRIBER)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
209 d.addCallback(cb)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
210 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
211
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
212
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
213 def test_addSubscription(self):
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
214 def cb1(void):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
215 return self.node.getSubscription(SUBSCRIBER_NEW)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
216
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
217 def cb2(subscription):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
218 self.assertEqual(subscription.state, 'pending')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
219
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
220 d = self.node.addSubscription(SUBSCRIBER_NEW, 'pending', {})
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
221 d.addCallback(cb1)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
222 d.addCallback(cb2)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
223 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
224
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
225
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
226 def test_addExistingSubscription(self):
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
227 d = self.node.addSubscription(SUBSCRIBER, 'pending', {})
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
228 self.assertFailure(d, error.SubscriptionExists)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
229 return d
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
230
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
231
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
232 def test_getSubscription(self):
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
233 def cb(subscriptions):
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
234 self.assertEquals(subscriptions[0].state, 'subscribed')
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
235 self.assertEquals(subscriptions[1].state, 'pending')
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
236 self.assertEquals(subscriptions[2], None)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
237
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
238 d = defer.gatherResults([self.node.getSubscription(SUBSCRIBER),
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
239 self.node.getSubscription(SUBSCRIBER_PENDING),
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
240 self.node.getSubscription(OWNER)])
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
241 d.addCallback(cb)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
242 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
243
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
244
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
245 def test_removeSubscription(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
246 return self.node.removeSubscription(SUBSCRIBER_TO_BE_DELETED)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
247
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
248
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
249 def test_removeNonExistingSubscription(self):
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
250 d = self.node.removeSubscription(OWNER)
171
bc269696ef42 Reply with the correct error condition on subscription when not subscribed.
Ralph Meijer <ralphm@ik.nu>
parents: 167
diff changeset
251 self.assertFailure(d, error.NotSubscribed)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
252 return d
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
253
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
254
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
255 def test_getNodeSubscriptions(self):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
256 def extractSubscribers(subscriptions):
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
257 return [subscription.subscriber for subscription in subscriptions]
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
258
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
259 def cb(subscribers):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
260 self.assertIn(SUBSCRIBER, subscribers)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
261 self.assertNotIn(SUBSCRIBER_PENDING, subscribers)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
262 self.assertNotIn(OWNER, subscribers)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
263
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
264 d = self.node.getSubscriptions('subscribed')
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
265 d.addCallback(extractSubscribers)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
266 d.addCallback(cb)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
267 return d
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
268
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
269
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
270 def test_isSubscriber(self):
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
271 def cb(subscribed):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
272 self.assertEquals(subscribed[0][1], True)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
273 self.assertEquals(subscribed[1][1], True)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
274 self.assertEquals(subscribed[2][1], False)
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
275 self.assertEquals(subscribed[3][1], False)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
276
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
277 d = defer.DeferredList([self.node.isSubscribed(SUBSCRIBER),
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
278 self.node.isSubscribed(SUBSCRIBER.userhostJID()),
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
279 self.node.isSubscribed(SUBSCRIBER_PENDING),
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
280 self.node.isSubscribed(OWNER)])
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
281 d.addCallback(cb)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
282 return d
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
283
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
284
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
285 def test_storeItems(self):
138
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
286 def cb1(void):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
287 return self.node.getItemsById(['new'])
138
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
288
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
289 def cb2(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
290 self.assertEqual(ITEM_NEW.toXml(), result[0].toXml())
138
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
291
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
292 d = self.node.storeItems([ITEM_NEW], PUBLISHER)
138
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
293 d.addCallback(cb1)
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
294 d.addCallback(cb2)
635e433810ef Actually test whether the item was indeed stored.
Ralph Meijer <ralphm@ik.nu>
parents: 137
diff changeset
295 return d
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
296
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
297
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
298 def test_storeUpdatedItems(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
299 def cb1(void):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
300 return self.node.getItemsById(['current'])
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
301
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
302 def cb2(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
303 self.assertEqual(ITEM_UPDATED.toXml(), result[0].toXml())
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
304
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
305 d = self.node.storeItems([ITEM_UPDATED], PUBLISHER)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
306 d.addCallback(cb1)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
307 d.addCallback(cb2)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
308 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
309
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
310
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
311 def test_removeItems(self):
142
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted
Ralph Meijer <ralphm@ik.nu>
parents: 139
diff changeset
312 def cb1(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
313 self.assertEqual(['to-be-deleted'], result)
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
314 return self.node.getItemsById(['to-be-deleted'])
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
315
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
316 def cb2(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
317 self.assertEqual(0, len(result))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
318
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
319 d = self.node.removeItems(['to-be-deleted'])
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
320 d.addCallback(cb1)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
321 d.addCallback(cb2)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
322 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
323
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
324
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
325 def test_removeNonExistingItems(self):
142
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted
Ralph Meijer <ralphm@ik.nu>
parents: 139
diff changeset
326 def cb(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
327 self.assertEqual([], result)
142
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted
Ralph Meijer <ralphm@ik.nu>
parents: 139
diff changeset
328
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
329 d = self.node.removeItems(['non-existing'])
142
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted
Ralph Meijer <ralphm@ik.nu>
parents: 139
diff changeset
330 d.addCallback(cb)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
331 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
332
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
333
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
334 def test_getItems(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
335 def cb(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
336 items = [item.toXml() for item in result]
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
337 self.assertIn(ITEM.toXml(), items)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
338
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
339 d = self.node.getItems()
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
340 d.addCallback(cb)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
341 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
342
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
343
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
344 def test_lastItem(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
345 def cb(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
346 self.assertEqual(1, len(result))
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
347 self.assertEqual(ITEM.toXml(), result[0].toXml())
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
348
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
349 d = self.node.getItems(1)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
350 d.addCallback(cb)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
351 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
352
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
353
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
354 def test_getItemsById(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
355 def cb(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
356 self.assertEqual(1, len(result))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
357
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
358 d = self.node.getItemsById(['current'])
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
359 d.addCallback(cb)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
360 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
361
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
362
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
363 def test_getNonExistingItemsById(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
364 def cb(result):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
365 self.assertEqual(0, len(result))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
366
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
367 d = self.node.getItemsById(['non-existing'])
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
368 d.addCallback(cb)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
369 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
370
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
371
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
372 def test_purge(self):
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
373 def cb1(node):
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
374 d = node.purge()
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
375 d.addCallback(lambda _: node)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
376 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
377
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
378 def cb2(node):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
379 return node.getItems()
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
380
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
381 def cb3(result):
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
382 self.assertEqual([], result)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
383
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
384 d = self.s.getNode('to-be-purged')
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
385 d.addCallback(cb1)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
386 d.addCallback(cb2)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
387 d.addCallback(cb3)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
388 return d
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
389
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
390
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
391 def test_getNodeAffilatiations(self):
145
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
392 def cb1(node):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
393 return node.getAffiliations()
145
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
394
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
395 def cb2(affiliations):
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
396 affiliations = dict(((a[0].full(), a[1]) for a in affiliations))
157
21fcfb86433f Fix tests to work with current Twisted. Really do 0.5.0 release.
Ralph Meijer <ralphm@ik.nu>
parents: 155
diff changeset
397 self.assertEquals(affiliations[OWNER.full()], 'owner')
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
398
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
399 d = self.s.getNode('pre-existing')
145
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
400 d.addCallback(cb1)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
401 d.addCallback(cb2)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
402 return d
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of
Ralph Meijer <ralphm@ik.nu>
parents: 142
diff changeset
403
171
bc269696ef42 Reply with the correct error condition on subscription when not subscribed.
Ralph Meijer <ralphm@ik.nu>
parents: 167
diff changeset
404
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
405
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
406 class MemoryStorageStorageTestCase(unittest.TestCase, StorageTests):
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
407
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
408 def setUp(self):
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
409 from idavoll.memory_storage import Storage, PublishedItem, LeafNode
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
410 from idavoll.memory_storage import Subscription
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
411
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
412 defaultConfig = Storage.defaultConfig['leaf']
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
413
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
414 self.s = Storage()
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
415 self.s._nodes['pre-existing'] = \
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
416 LeafNode('pre-existing', OWNER, defaultConfig)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
417 self.s._nodes['to-be-deleted'] = \
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
418 LeafNode('to-be-deleted', OWNER, None)
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
419 self.s._nodes['to-be-reconfigured'] = \
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
420 LeafNode('to-be-reconfigured', OWNER, defaultConfig)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
421 self.s._nodes['to-be-purged'] = \
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
422 LeafNode('to-be-purged', OWNER, None)
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
423
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
424 subscriptions = self.s._nodes['pre-existing']._subscriptions
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
425 subscriptions[SUBSCRIBER.full()] = Subscription('pre-existing',
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
426 SUBSCRIBER,
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
427 'subscribed')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
428 subscriptions[SUBSCRIBER_TO_BE_DELETED.full()] = \
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
429 Subscription('pre-existing', SUBSCRIBER_TO_BE_DELETED,
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
430 'subscribed')
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
431 subscriptions[SUBSCRIBER_PENDING.full()] = \
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
432 Subscription('pre-existing', SUBSCRIBER_PENDING,
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
433 'pending')
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
434
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
435 item = PublishedItem(ITEM_TO_BE_DELETED, PUBLISHER)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
436 self.s._nodes['pre-existing']._items['to-be-deleted'] = item
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
437 self.s._nodes['pre-existing']._itemlist.append(item)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
438 self.s._nodes['to-be-purged']._items['to-be-deleted'] = item
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
439 self.s._nodes['to-be-purged']._itemlist.append(item)
202
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML.
Ralph Meijer <ralphm@ik.nu>
parents: 198
diff changeset
440 item = PublishedItem(ITEM, PUBLISHER)
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
441 self.s._nodes['pre-existing']._items['current'] = item
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
442 self.s._nodes['pre-existing']._itemlist.append(item)
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
443
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
444 return StorageTests.setUp(self)
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
445
171
bc269696ef42 Reply with the correct error condition on subscription when not subscribed.
Ralph Meijer <ralphm@ik.nu>
parents: 167
diff changeset
446
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
447
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
448 class PgsqlStorageStorageTestCase(unittest.TestCase, StorageTests):
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
449
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
450 def setUp(self):
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
451 from idavoll.pgsql_storage import Storage
204
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
452 from twisted.enterprise import adbapi
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
453 self.dbpool = adbapi.ConnectionPool('pyPgSQL.PgSQL',
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
454 database='pubsub_test',
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
455 cp_reconnect=True,
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
456 client_encoding='utf-8',
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
457 )
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
458 self.s = Storage(self.dbpool)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
459 self.dbpool.start()
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
460 d = self.dbpool.runInteraction(self.init)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
461 d.addCallback(lambda _: StorageTests.setUp(self))
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
462 return d
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
463
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
464
204
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
465 def tearDown(self):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway.
Ralph Meijer <ralphm@ik.nu>
parents: 202
diff changeset
466 return self.dbpool.runInteraction(self.cleandb)
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
467
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
468
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
469 def init(self, cursor):
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
470 self.cleandb(cursor)
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
471 cursor.execute("""INSERT INTO nodes
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
472 (node, node_type, persist_items)
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
473 VALUES ('pre-existing', 'leaf', TRUE)""")
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
474 cursor.execute("""INSERT INTO nodes (node) VALUES ('to-be-deleted')""")
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
475 cursor.execute("""INSERT INTO nodes (node) VALUES ('to-be-reconfigured')""")
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
476 cursor.execute("""INSERT INTO nodes (node) VALUES ('to-be-purged')""")
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
477 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
478 OWNER.userhost())
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
479 cursor.execute("""INSERT INTO affiliations
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
480 (node_id, entity_id, affiliation)
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
481 SELECT node_id, entity_id, 'owner'
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
482 FROM nodes, entities
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
483 WHERE node='pre-existing' AND jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
484 OWNER.userhost())
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
485 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
486 SUBSCRIBER.userhost())
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
487 cursor.execute("""INSERT INTO subscriptions
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
488 (node_id, entity_id, resource, state)
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
489 SELECT node_id, entity_id, %s, 'subscribed'
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
490 FROM nodes, entities
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
491 WHERE node='pre-existing' AND jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
492 (SUBSCRIBER.resource,
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
493 SUBSCRIBER.userhost()))
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
494 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
495 SUBSCRIBER_TO_BE_DELETED.userhost())
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
496 cursor.execute("""INSERT INTO subscriptions
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
497 (node_id, entity_id, resource, state)
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
498 SELECT node_id, entity_id, %s, 'subscribed'
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
499 FROM nodes, entities
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
500 WHERE node='pre-existing' AND jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
501 (SUBSCRIBER_TO_BE_DELETED.resource,
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
502 SUBSCRIBER_TO_BE_DELETED.userhost()))
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
503 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
504 SUBSCRIBER_PENDING.userhost())
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
505 cursor.execute("""INSERT INTO subscriptions
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
506 (node_id, entity_id, resource, state)
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
507 SELECT node_id, entity_id, %s, 'pending'
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
508 FROM nodes, entities
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
509 WHERE node='pre-existing' AND jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
510 (SUBSCRIBER_PENDING.resource,
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
511 SUBSCRIBER_PENDING.userhost()))
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
512 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
513 PUBLISHER.userhost())
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
514 cursor.execute("""INSERT INTO items
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
515 (node_id, publisher, item, data, date)
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
516 SELECT node_id, %s, 'to-be-deleted', %s,
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
517 now() - interval '1 day'
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
518 FROM nodes
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
519 WHERE node='pre-existing'""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
520 (PUBLISHER.userhost(),
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
521 ITEM_TO_BE_DELETED.toXml()))
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
522 cursor.execute("""INSERT INTO items (node_id, publisher, item, data)
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
523 SELECT node_id, %s, 'to-be-deleted', %s
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
524 FROM nodes
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
525 WHERE node='to-be-purged'""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
526 (PUBLISHER.userhost(),
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
527 ITEM_TO_BE_DELETED.toXml()))
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
528 cursor.execute("""INSERT INTO items (node_id, publisher, item, data)
206
274a45d2a5ab Implement root collection that includes all leaf nodes.
Ralph Meijer <ralphm@ik.nu>
parents: 204
diff changeset
529 SELECT node_id, %s, 'current', %s
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
530 FROM nodes
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
531 WHERE node='pre-existing'""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
532 (PUBLISHER.userhost(),
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
533 ITEM.toXml()))
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
534
198
e404775b12df Change naming and spacing conventions to match Twisted's.
Ralph Meijer <ralphm@ik.nu>
parents: 171
diff changeset
535
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
536 def cleandb(self, cursor):
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
537 cursor.execute("""DELETE FROM nodes WHERE node in
117
bc872c33e88c Added test cases for a few of the Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 114
diff changeset
538 ('non-existing', 'pre-existing', 'to-be-deleted',
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
539 'new 1', 'new 2', 'new 3', 'to-be-reconfigured',
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
540 'to-be-purged')""")
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
541 cursor.execute("""DELETE FROM entities WHERE jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
542 OWNER.userhost())
114
e7cfe05bc1d2 Initial revision.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
543 cursor.execute("""DELETE FROM entities WHERE jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
544 SUBSCRIBER.userhost())
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
545 cursor.execute("""DELETE FROM entities WHERE jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
546 SUBSCRIBER_TO_BE_DELETED.userhost())
123
8f99b4f7aea2 Add tests for all Node methods.
Ralph Meijer <ralphm@ik.nu>
parents: 117
diff changeset
547 cursor.execute("""DELETE FROM entities WHERE jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
548 SUBSCRIBER_PENDING.userhost())
131
fe8cb99363ff Add test cases for LeafNodes.
Ralph Meijer <ralphm@ik.nu>
parents: 123
diff changeset
549 cursor.execute("""DELETE FROM entities WHERE jid=%s""",
137
aca904a41a43 Discover client_encoding parameter to pyPgSQL.
Ralph Meijer <ralphm@ik.nu>
parents: 131
diff changeset
550 PUBLISHER.userhost())
167
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
551
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
552 try:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
553 import pyPgSQL
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
554 pyPgSQL
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
555 except ImportError:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel.
Ralph Meijer <ralphm@ik.nu>
parents: 157
diff changeset
556 PgsqlStorageStorageTestCase.skip = "pyPgSQL not available"