jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual cleanup of the remaining set([…]) and set((…)).

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot
2016-10-22 13:35:54 +01:00
parent dcacc7d7d5
commit d008988843
35 changed files with 180 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_stanza_element.py
View File

@@ -561,12 +561,12 @@ class TestElementBase(SlixTest):
stanza = TestStanza()
self.failUnless(set(stanza.keys()) == set(('lang', 'bar', 'baz')),
self.failUnless(set(stanza.keys()) == {'lang', 'bar', 'baz'},
"Returned set of interface keys does not match expected.")
stanza.enable('qux')
self.failUnless(set(stanza.keys()) == set(('lang', 'bar', 'baz', 'qux')),
self.failUnless(set(stanza.keys()) == {'lang', 'bar', 'baz', 'qux'},
"Incorrect set of interface and plugin keys.")
def testGet(self):

14
tests/test_stanza_xep_0030.py
View File

@@ -254,10 +254,10 @@ class TestDisco(SlixTest):
iq['disco_info'].add_identity('client', 'pc', lang='en')
iq['disco_info'].add_identity('client', 'pc', lang='fr')
expected = set([('client', 'pc', None, None),
('client', 'pc', 'no', None),
('client', 'pc', 'en', None),
('client', 'pc', 'fr', None)])
expected = {('client', 'pc', None, None),
('client', 'pc', 'no', None),
('client', 'pc', 'en', None),
('client', 'pc', 'fr', None)}
self.failUnless(iq['disco_info']['identities'] == expected,
"Identities do not match:\n%s\n%s" % (
expected,
@@ -472,9 +472,9 @@ class TestDisco(SlixTest):
node='bar',
name='Tester')
expected = set([('user@localhost', None, None),
('user@localhost', 'foo', None),
('test@localhost', 'bar', 'Tester')])
expected = {('user@localhost', None, None),
('user@localhost', 'foo', None),
('test@localhost', 'bar', 'Tester')}
self.failUnless(iq['disco_items']['items'] == expected,
"Items do not match:\n%s\n%s" % (
expected,

2
tests/test_stream_presence.py
View File

@@ -38,7 +38,7 @@ class TestStreamPresence(SlixTest):
to="tester@localhost"/>
""")
self.assertEqual(events, set(('unavailable',)),
self.assertEqual(events, {'unavailable'},
"Got offline incorrectly triggered: %s." % events)
def testGotOffline(self):

8
tests/test_stream_xep_0030.py
View File

@@ -307,7 +307,7 @@ class TestStreamDisco(SlixTest):
</iq>
""")
self.assertEqual(events, set(('disco_info',)),
self.assertEqual(events, {'disco_info'},
"Disco info event was not triggered: %s" % events)
def testDynamicItemsJID(self):
@@ -502,9 +502,9 @@ class TestStreamDisco(SlixTest):
</iq>
""")
items = set([('user@localhost', 'bar', 'Test'),
('user@localhost', 'baz', 'Test 2')])
self.assertEqual(events, set(('disco_items',)),
items = {('user@localhost', 'bar', 'Test'),
('user@localhost', 'baz', 'Test 2')}
self.assertEqual(events, {'disco_items'},
"Disco items event was not triggered: %s" % events)
self.assertEqual(results, items,
"Unexpected items: %s" % results)

2
tests/test_stream_xep_0047.py
View File

@@ -77,7 +77,7 @@ class TestInBandByteStreams(SlixTest):
from="tester@localhost/receiver" />
""")
self.assertEqual(events, set(['ibb_stream_start', 'callback']))
self.assertEqual(events, {'ibb_stream_start', 'callback'})
@asyncio.coroutine
def testSendData(self):