diff options
Diffstat (limited to 'tests/test_stream_xep_0092.py')
| -rw-r--r-- | tests/test_stream_xep_0092.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tests/test_stream_xep_0092.py b/tests/test_stream_xep_0092.py index c0748697..1f1eac00 100644 --- a/tests/test_stream_xep_0092.py +++ b/tests/test_stream_xep_0092.py @@ -1,10 +1,10 @@ import threading import unittest -from sleekxmpp.test import SleekTest +from slixmpp.test import SlixTest -class TestStreamSet(SleekTest): +class TestStreamSet(SlixTest): def tearDown(self): self.stream_close() @@ -12,7 +12,7 @@ class TestStreamSet(SleekTest): def testHandleSoftwareVersionRequest(self): self.stream_start(mode='client', plugins=['xep_0030', 'xep_0092']) - self.xmpp['xep_0092'].name = 'SleekXMPP' + self.xmpp['xep_0092'].name = 'Slixmpp' self.xmpp['xep_0092'].version = 'dev' self.xmpp['xep_0092'].os = 'Linux' @@ -25,7 +25,7 @@ class TestStreamSet(SleekTest): self.send(""" <iq type="result" id="1"> <query xmlns="jabber:iq:version"> - <name>SleekXMPP</name> + <name>Slixmpp</name> <version>dev</version> <os>Linux</os> </query> @@ -35,16 +35,14 @@ class TestStreamSet(SleekTest): def testMakeSoftwareVersionRequest(self): results = [] - def query(): - r = self.xmpp['xep_0092'].get_version('foo@bar') - results.append((r['software_version']['name'], - r['software_version']['version'], - r['software_version']['os'])) + def callback(result): + results.append((result['software_version']['name'], + result['software_version']['version'], + result['software_version']['os'])) self.stream_start(mode='client', plugins=['xep_0030', 'xep_0092']) - t = threading.Thread(target=query) - t.start() + self.xmpp['xep_0092'].get_version('foo@bar', callback=callback) self.send(""" <iq type="get" id="1" to="foo@bar"> @@ -62,8 +60,6 @@ class TestStreamSet(SleekTest): </iq> """) - t.join() - expected = [('Foo', '1.0', 'Linux')] self.assertEqual(results, expected, "Did not receive expected results: %s" % results) |