summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_plugins.py8
-rw-r--r--tests/test_stanza_element.py18
-rw-r--r--tests/test_stanza_xep_0030.py4
-rw-r--r--tests/test_stanza_xep_0050.py2
-rw-r--r--tests/test_stream_xep_0050.py2
5 files changed, 17 insertions, 17 deletions
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index ee6d44c0..a8cc2744 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -14,21 +14,21 @@ class B(BasePlugin):
class C(BasePlugin):
name = 'c'
- dependencies = set(['b', 'd'])
+ dependencies = {'b', 'd'}
class D(BasePlugin):
name = 'd'
- dependencies = set(['c'])
+ dependencies = {'c'}
class E(BasePlugin):
name = 'e'
- dependencies = set(['a', 'd'])
+ dependencies = {'a', 'd'}
class F(BasePlugin):
name = 'f'
- dependencies = set(['a', 'b'])
+ dependencies = {'a', 'b'}
register_plugin(A)
diff --git a/tests/test_stanza_element.py b/tests/test_stanza_element.py
index 26cc2438..678a49fd 100644
--- a/tests/test_stanza_element.py
+++ b/tests/test_stanza_element.py
@@ -754,7 +754,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = "foo"
namespace = "foo"
- interfaces = set(['bar'])
+ interfaces = {'bar'}
bool_interfaces = interfaces
stanza = TestStanza()
@@ -946,7 +946,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -972,7 +972,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1008,7 +1008,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1040,7 +1040,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1096,7 +1096,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1136,7 +1136,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1177,7 +1177,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
@@ -1217,7 +1217,7 @@ class TestElementBase(SlixTest):
class TestStanza(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['test'])
+ interfaces = {'test'}
sub_interfaces = interfaces
lang_interfaces = interfaces
diff --git a/tests/test_stanza_xep_0030.py b/tests/test_stanza_xep_0030.py
index d8e99ffb..71dc7032 100644
--- a/tests/test_stanza_xep_0030.py
+++ b/tests/test_stanza_xep_0030.py
@@ -274,7 +274,7 @@ 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', 'no', None)])
+ expected = {('client', 'pc', 'no', None)}
result = iq['disco_info'].get_identities(lang='no')
self.failUnless(result == expected,
"Identities do not match:\n%s\n%s" % (
@@ -336,7 +336,7 @@ class TestDisco(SlixTest):
iq['disco_info'].add_feature('bar')
iq['disco_info'].add_feature('baz')
- expected = set(['foo', 'bar', 'baz'])
+ expected = {'foo', 'bar', 'baz'}
self.failUnless(iq['disco_info']['features'] == expected,
"Features do not match:\n%s\n%s" % (
expected,
diff --git a/tests/test_stanza_xep_0050.py b/tests/test_stanza_xep_0050.py
index 7272d783..0898b136 100644
--- a/tests/test_stanza_xep_0050.py
+++ b/tests/test_stanza_xep_0050.py
@@ -51,7 +51,7 @@ class TestAdHocCommandStanzas(SlixTest):
iq['command']['actions'] = ['prev', 'next']
results = iq['command']['actions']
- expected = set(['prev', 'next'])
+ expected = {'prev', 'next'}
self.assertEqual(results, expected,
"Incorrect next actions: %s" % results)
diff --git a/tests/test_stream_xep_0050.py b/tests/test_stream_xep_0050.py
index 65b5f678..d1a94ecc 100644
--- a/tests/test_stream_xep_0050.py
+++ b/tests/test_stream_xep_0050.py
@@ -25,7 +25,7 @@ class TestAdHocCommands(SlixTest):
class TestPayload(ElementBase):
name = 'foo'
namespace = 'test'
- interfaces = set(['bar'])
+ interfaces = {'bar'}
plugin_attrib = name
Command = self.xmpp['xep_0050'].stanza.Command