Mercurial > libervia-pubsub
diff sat_pubsub/test/test_storage.py @ 414:ccb2a22ea0fc
Python 3 port:
/!\ Python 3.6+ is now needed to use SàT Pubsub
/!\ instability may occur and features may not be working anymore, this will improve with time
The same procedure as in backend has been applied (check backend commit ab2696e34d29 logs
for details).
Python minimal version has been updated in setup.py
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 16 Aug 2019 12:53:33 +0200 |
| parents | c56a728412f1 |
| children | 074037832daf |
line wrap: on
line diff
--- a/sat_pubsub/test/test_storage.py Fri Aug 16 12:48:34 2019 +0200 +++ b/sat_pubsub/test/test_storage.py Fri Aug 16 12:53:33 2019 +0200 @@ -70,16 +70,16 @@ PUBLISHER = jid.JID('publisher@example.com') ITEM = domish.Element((None, 'item')) ITEM['id'] = 'current' -ITEM.addElement(('testns', 'test'), content=u'Test \u2083 item') +ITEM.addElement(('testns', 'test'), content='Test \u2083 item') ITEM_NEW = domish.Element((None, 'item')) ITEM_NEW['id'] = 'new' -ITEM_NEW.addElement(('testns', 'test'), content=u'Test \u2083 item') +ITEM_NEW.addElement(('testns', 'test'), content='Test \u2083 item') ITEM_UPDATED = domish.Element((None, 'item')) ITEM_UPDATED['id'] = 'current' -ITEM_UPDATED.addElement(('testns', 'test'), content=u'Test \u2084 item') +ITEM_UPDATED.addElement(('testns', 'test'), content='Test \u2084 item') ITEM_TO_BE_DELETED = domish.Element((None, 'item')) ITEM_TO_BE_DELETED['id'] = 'to-be-deleted' -ITEM_TO_BE_DELETED.addElement(('testns', 'test'), content=u'Test \u2083 item') +ITEM_TO_BE_DELETED.addElement(('testns', 'test'), content='Test \u2083 item') def decode(object): if isinstance(object, str): @@ -230,8 +230,8 @@ def test_getConfiguration(self): config = self.node.getConfiguration() - self.assertIn('pubsub#persist_items', config.iterkeys()) - self.assertIn('pubsub#deliver_payloads', config.iterkeys()) + self.assertIn('pubsub#persist_items', iter(config.keys())) + self.assertIn('pubsub#deliver_payloads', iter(config.keys())) self.assertEqual(config['pubsub#persist_items'], True) self.assertEqual(config['pubsub#deliver_payloads'], True) @@ -263,10 +263,10 @@ def test_getMetaData(self): metaData = self.node.getMetaData() - for key, value in self.node.getConfiguration().iteritems(): - self.assertIn(key, metaData.iterkeys()) + for key, value in self.node.getConfiguration().items(): + self.assertIn(key, iter(metaData.keys())) self.assertEqual(value, metaData[key]) - self.assertIn('pubsub#node_type', metaData.iterkeys()) + self.assertIn('pubsub#node_type', iter(metaData.keys())) self.assertEqual(metaData['pubsub#node_type'], 'leaf') @@ -309,9 +309,9 @@ def test_getSubscription(self): def cb(subscriptions): - self.assertEquals(subscriptions[0].state, 'subscribed') - self.assertEquals(subscriptions[1].state, 'pending') - self.assertEquals(subscriptions[2], None) + self.assertEqual(subscriptions[0].state, 'subscribed') + self.assertEqual(subscriptions[1].state, 'pending') + self.assertEqual(subscriptions[2], None) d = defer.gatherResults([self.node.getSubscription(SUBSCRIBER), self.node.getSubscription(SUBSCRIBER_PENDING), @@ -347,10 +347,10 @@ def test_isSubscriber(self): def cb(subscribed): - self.assertEquals(subscribed[0][1], True) - self.assertEquals(subscribed[1][1], True) - self.assertEquals(subscribed[2][1], False) - self.assertEquals(subscribed[3][1], False) + self.assertEqual(subscribed[0][1], True) + self.assertEqual(subscribed[1][1], True) + self.assertEqual(subscribed[2][1], False) + self.assertEqual(subscribed[3][1], False) d = defer.DeferredList([self.node.isSubscribed(SUBSCRIBER), self.node.isSubscribed(SUBSCRIBER.userhostJID()), @@ -471,7 +471,7 @@ def cb2(affiliations): affiliations = dict(((a[0].full(), a[1]) for a in affiliations)) - self.assertEquals(affiliations[OWNER.userhost()], 'owner') + self.assertEqual(affiliations[OWNER.userhost()], 'owner') d = self.s.getNode('pre-existing') d.addCallback(cb1)