From 13de36baa1ad0b57fd674f514203d3ea34ee5c7d Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 14 Feb 2021 12:06:05 +0100 Subject: XEP-0030: API changes - ``supports``, ``has_identity``, ``get_info``, ``get_items`` are now coroutines - ``set_info````set_items``, ``del_items``, ``add_item``, ``add_identity``, ``del_identity``, ``set_identities``, ``del_identities``, ``add_feature``, ``del_feature``, ``set_feature``, ``set_features``, ``del_features`` now return a Future also fix has_identity and supports which have been broken in forever --- tests/test_stream_xep_0030.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test_stream_xep_0030.py b/tests/test_stream_xep_0030.py index d1ad9087..8cba8280 100644 --- a/tests/test_stream_xep_0030.py +++ b/tests/test_stream_xep_0030.py @@ -1,5 +1,5 @@ +import asyncio import time -import threading import unittest from slixmpp.test import SlixTest @@ -288,7 +288,9 @@ class TestStreamDisco(SlixTest): self.xmpp.add_event_handler('disco_info', handle_disco_info) - self.xmpp['xep_0030'].get_info('user@localhost', 'foo') + + self.xmpp.wrap(self.xmpp['xep_0030'].get_info('user@localhost', 'foo')) + self.wait_() self.send(""" @@ -483,7 +485,8 @@ class TestStreamDisco(SlixTest): self.xmpp.add_event_handler('disco_items', handle_disco_items) - self.xmpp['xep_0030'].get_items('user@localhost', 'foo') + self.xmpp.wrap(self.xmpp['xep_0030'].get_items('user@localhost', 'foo')) + self.wait_() self.send(""" -- cgit v1.2.3 From d17967f58e05b090c4973cee320792dd82db2513 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 14 Feb 2021 12:11:58 +0100 Subject: XEP-0047: API changes and fix unit tests broken for years. --- tests/test_stream_xep_0047.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/test_stream_xep_0047.py b/tests/test_stream_xep_0047.py index 53225df5..a44ffbec 100644 --- a/tests/test_stream_xep_0047.py +++ b/tests/test_stream_xep_0047.py @@ -14,7 +14,7 @@ class TestInBandByteStreams(SlixTest): def tearDown(self): self.stream_close() - async def testOpenStream(self): + def testOpenStream(self): """Test requesting a stream, successfully""" events = [] @@ -25,8 +25,9 @@ class TestInBandByteStreams(SlixTest): self.xmpp.add_event_handler('ibb_stream_start', on_stream_start) - await self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', - sid='testing') + self.xmpp.wrap(self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', + sid='testing')) + self.wait_() self.send(""" @@ -45,7 +46,7 @@ class TestInBandByteStreams(SlixTest): self.assertEqual(events, ['ibb_stream_start']) - async def testAysncOpenStream(self): + def testAysncOpenStream(self): """Test requesting a stream, aysnc""" events = set() @@ -58,9 +59,10 @@ class TestInBandByteStreams(SlixTest): self.xmpp.add_event_handler('ibb_stream_start', on_stream_start) - await self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', - sid='testing', - callback=stream_callback) + self.xmpp.wrap(self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', + sid='testing', + callback=stream_callback)) + self.wait_() self.send(""" @@ -79,7 +81,7 @@ class TestInBandByteStreams(SlixTest): self.assertEqual(events, {'ibb_stream_start', 'callback'}) - async def testSendData(self): + def testSendData(self): """Test sending data over an in-band bytestream.""" streams = [] @@ -89,13 +91,14 @@ class TestInBandByteStreams(SlixTest): streams.append(stream) def on_stream_data(d): - data.append(d['data']) + data.append(d.read()) self.xmpp.add_event_handler('ibb_stream_start', on_stream_start) self.xmpp.add_event_handler('ibb_stream_data', on_stream_data) - self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', - sid='testing') + self.xmpp.wrap(self.xmpp['xep_0047'].open_stream('tester@localhost/receiver', + sid='testing')) + self.wait_() self.send(""" @@ -116,7 +119,8 @@ class TestInBandByteStreams(SlixTest): # Test sending data out - await stream.send("Testing") + self.xmpp.wrap(stream.send("Testing")) + self.wait_() self.send(""" Date: Thu, 18 Feb 2021 20:24:37 +0100 Subject: XEP-0077: API changes --- tests/test_stream_xep_0077.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_stream_xep_0077.py b/tests/test_stream_xep_0077.py index c47c4de5..69fc9255 100644 --- a/tests/test_stream_xep_0077.py +++ b/tests/test_stream_xep_0077.py @@ -91,7 +91,9 @@ class TestRegistration(SlixTest): self.send("") pseudo_iq = self.xmpp.Iq() pseudo_iq["from"] = "bill@shakespeare.lit/globe" - user = self.xmpp["xep_0077"].api["user_get"](None, None, None, pseudo_iq) + fut = self.xmpp.wrap(self.xmpp["xep_0077"].api["user_get"](None, None, None, pseudo_iq)) + self.run_coro(fut) + user = fut.result() self.assertEqual(user["username"], "bill") self.assertEqual(user["password"], "Calliope") self.recv( -- cgit v1.2.3