diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-19 21:50:33 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-19 21:50:33 -0700 |
| commit | 5820d49cd401a1362a8a675c4b91935adb1240fe (patch) | |
| tree | f40f78839ae3004bfb0b8da1ae93d61759d8ad66 /tests | |
| parent | 1ab66e576786ecb0cfb9b6b163811735564b951b (diff) | |
| parent | 36c11ad9de7c1b5a199aa5a4302e33085513c126 (diff) | |
| download | slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.gz slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.bz2 slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.tar.xz slixmpp-5820d49cd401a1362a8a675c4b91935adb1240fe.zip | |
Merge branch 'master' into develop
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_stanza_element.py | 12 | ||||
| -rw-r--r-- | tests/test_stanza_xep_0050.py | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/test_stanza_element.py b/tests/test_stanza_element.py index 09093003..1b47e733 100644 --- a/tests/test_stanza_element.py +++ b/tests/test_stanza_element.py @@ -64,14 +64,18 @@ class TestElementBase(SleekTest): stanza.append(substanza) values = stanza.getStanzaValues() - expected = {'bar': 'a', + expected = {'lang': '', + 'bar': 'a', 'baz': '', - 'foo2': {'bar': '', + 'foo2': {'lang': '', + 'bar': '', 'baz': 'b'}, 'substanzas': [{'__childtag__': '{foo}foo2', + 'lang': '', 'bar': '', 'baz': 'b'}, {'__childtag__': '{foo}subfoo', + 'lang': '', 'bar': 'c', 'baz': ''}]} self.failUnless(values == expected, @@ -555,12 +559,12 @@ class TestElementBase(SleekTest): stanza = TestStanza() - self.failUnless(set(stanza.keys()) == set(('bar', 'baz')), + self.failUnless(set(stanza.keys()) == set(('lang', 'bar', 'baz')), "Returned set of interface keys does not match expected.") stanza.enable('qux') - self.failUnless(set(stanza.keys()) == set(('bar', 'baz', 'qux')), + self.failUnless(set(stanza.keys()) == set(('lang', 'bar', 'baz', 'qux')), "Incorrect set of interface and plugin keys.") def testGet(self): diff --git a/tests/test_stanza_xep_0050.py b/tests/test_stanza_xep_0050.py index ae584de4..e02e86c3 100644 --- a/tests/test_stanza_xep_0050.py +++ b/tests/test_stanza_xep_0050.py @@ -49,7 +49,7 @@ class TestAdHocCommandStanzas(SleekTest): iq['command']['actions'] = ['prev', 'next'] results = iq['command']['actions'] - expected = ['prev', 'next'] + expected = set(['prev', 'next']) self.assertEqual(results, expected, "Incorrect next actions: %s" % results) |