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

fix error namespace for ComponentXMPP

Browse Source 
in SlixTest, if mode=="component", restore
jabber:client namespace afterwards

Fixes #3476
Fixes #3474
This commit is contained in:
nicoco
2023-02-26 22:32:21 +01:00
parent 4fa068da54
commit e16f72d32d
30 changed files with 31 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/live_test.py
View File

@@ -8,9 +8,6 @@ class TestLiveStream(SlixTest):
Test that we can test a live stanza stream.
"""
def tearDown(self):
self.stream_close()
def testClientConnection(self):
"""Test that we can interact with a live ClientXMPP instance."""
self.stream_start(mode='client',

3
tests/test_events.py
View File

@@ -8,9 +8,6 @@ class TestEvents(SlixTest):
def setUp(self):
self.stream_start()
def tearDown(self):
self.stream_close()
def testEventHappening(self):
"""Test handler working"""
happened = []

4
tests/test_stanza_iq.py
View File

@@ -5,10 +5,6 @@ from slixmpp.xmlstream.stanzabase import ET
class TestIqStanzas(SlixTest):
def tearDown(self):
"""Shutdown the XML stream after testing."""
self.stream_close()
def testSetup(self):
"""Test initializing default Iq values."""
iq = self.Iq()

3
tests/test_stream.py
View File

@@ -8,9 +8,6 @@ class TestStreamTester(SlixTest):
Test that we can simulate and test a stanza stream.
"""
def tearDown(self):
self.stream_close()
def testClientEcho(self):
"""Test that we can interact with a ClientXMPP instance."""
self.stream_start(mode='client')

3
tests/test_stream_exceptions.py
View File

@@ -10,9 +10,6 @@ class TestStreamExceptions(SlixTest):
Test handling roster updates.
"""
def tearDown(self):
self.stream_close()
def testExceptionContinueWorking(self):
"""Test that Slixmpp continues to respond after an XMPPError is raised."""

3
tests/test_stream_filters.py
View File

@@ -14,9 +14,6 @@ class TestFilters(SlixTest):
def setUp(self):
self.stream_start()
def tearDown(self):
self.stream_close()
def testIncoming(self):
data = []

3
tests/test_stream_handlers.py
View File

@@ -15,9 +15,6 @@ class TestHandlers(SlixTest):
def setUp(self):
self.stream_start()
def tearDown(self):
self.stream_close()
def testCallback(self):
"""Test using stream callback handlers."""

3
tests/test_stream_presence.py
View File

@@ -11,9 +11,6 @@ class TestStreamPresence(SlixTest):
def setUp(self):
self.stream_start(jid='tester@localhost', plugins=[])
def tearDown(self):
self.stream_close()
def testInitialUnavailablePresences(self):
"""
Test receiving unavailable presences from JIDs that

3
tests/test_stream_roster.py
View File

@@ -13,9 +13,6 @@ class TestStreamRoster(SlixTest):
Test handling roster updates.
"""
def tearDown(self):
self.stream_close()
def testGetRoster(self):
"""Test handling roster requests."""
self.stream_start(mode='client', jid='tester@localhost')

3
tests/test_stream_xep_0030.py
View File

@@ -11,9 +11,6 @@ class TestStreamDisco(SlixTest):
Test using the XEP-0030 plugin.
"""
def tearDown(self):
self.stream_close()
def testInfoEmptyDefaultNode(self):
"""
Info query result from an entity MUST have at least one identity

3
tests/test_stream_xep_0047.py
View File

@@ -11,9 +11,6 @@ class TestInBandByteStreams(SlixTest):
def setUp(self):
self.stream_start(plugins=['xep_0047', 'xep_0030'])
def tearDown(self):
self.stream_close()
def testOpenStream(self):
"""Test requesting a stream, successfully"""

3
tests/test_stream_xep_0050.py
View File

@@ -16,9 +16,6 @@ class TestAdHocCommands(SlixTest):
# a dummy value.
self.xmpp['xep_0050'].new_session = lambda: '_sessionid_'
def tearDown(self):
self.stream_close()
def testInitialPayloadCommand(self):
"""Test a command with an initial payload."""

3
tests/test_stream_xep_0055.py
View File

@@ -19,9 +19,6 @@ class TestJabberSearch(SlixTest):
self.xmpp["xep_0055"].api.register(get_results, "search_query")
self.xmpp["xep_0055"].api.register(get_results, "search_query")
def tearDown(self):
self.stream_close()
def testRequestingSearchFields(self):
self.recv(
"""

3
tests/test_stream_xep_0060.py
View File

@@ -15,9 +15,6 @@ class TestStreamPubsub(SlixTest):
def setUp(self):
self.stream_start()
def tearDown(self):
self.stream_close()
def testCreateInstantNode(self):
"""Test creating an instant node"""
self.xmpp['xep_0060'].create_node('pubsub.example.com', None)

3
tests/test_stream_xep_0066.py
View File

@@ -6,9 +6,6 @@ from slixmpp.test import SlixTest
class TestOOB(SlixTest):
def tearDown(self):
self.stream_close()
def testSendOOB(self):
"""Test sending an OOB transfer request."""
self.stream_start(plugins=['xep_0066', 'xep_0030'])

3
tests/test_stream_xep_0085.py
View File

@@ -6,9 +6,6 @@ from slixmpp.test import SlixTest
class TestStreamChatStates(SlixTest):
def tearDown(self):
self.stream_close()
def testChatStates(self):
self.stream_start(mode='client', plugins=['xep_0030', 'xep_0085'])

3
tests/test_stream_xep_0092.py
View File

@@ -6,9 +6,6 @@ from slixmpp.test import SlixTest
class TestStreamSet(SlixTest):
def tearDown(self):
self.stream_close()
def testHandleSoftwareVersionRequest(self):
self.stream_start(mode='client', plugins=['xep_0030', 'xep_0092'])

4
tests/test_stream_xep_0100.py
View File

@@ -19,6 +19,7 @@ class TestStreamGateway(SlixTest):
"xep_0100": {"component_name": "AIM Gateway", "type": "aim"}
},
)
self.xmpp._fix_error_ns()
def next_sent(self):
self.wait_for_send_queue()
@@ -160,7 +161,6 @@ class TestStreamGateway(SlixTest):
</iq>
"""
)
# xmlns="jabber:client" in error substanza, bug in XEP-0077 plugin or OK?
self.send(
"""
<iq type='error'
@@ -171,7 +171,7 @@ class TestStreamGateway(SlixTest):
<username>RomeoMyRomeo</username>
<password>ILoveJuliet</password>
</query>
<error code='406' type='modify' xmlns="jabber:client">
<error code='406' type='modify'>
<not-acceptable
xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
<text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Not good</text>

3
tests/test_stream_xep_0128.py
View File

@@ -8,9 +8,6 @@ class TestStreamExtendedDisco(SlixTest):
Test using the XEP-0128 plugin.
"""
def tearDown(self):
self.stream_close()
def testUsingExtendedInfo(self):
self.stream_start(mode='client',
jid='tester@localhost',

3
tests/test_stream_xep_0249.py
View File

@@ -10,9 +10,6 @@ class TestStreamDirectInvite(SlixTest):
Test using the XEP-0249 plugin.
"""
def tearDown(self):
self.stream_close()
def testReceiveInvite(self):
self.stream_start(mode='client',
plugins=['xep_0030',

3
tests/test_stream_xep_0313.py
View File

@@ -9,9 +9,6 @@ class TestMAM(SlixTest):
def setUp(self):
self.stream_start(plugins=['xep_0313'])
def tearDown(self):
self.stream_close()
def testRetrieveSimple(self):
"""Test requesting MAM messages without RSM"""

3
tests/test_stream_xep_0323.py
View File

@@ -24,9 +24,6 @@ class TestStreamSensorData(SlixTest):
def _time_now(self):
return datetime.datetime.now().replace(microsecond=0).isoformat()
def tearDown(self):
self.stream_close()
def testRequestAccept(self):
self.stream_start(mode='component',
plugins=['xep_0030',

3
tests/test_stream_xep_0325.py
View File

@@ -30,9 +30,6 @@ class TestStreamControl(SlixTest):
def _time_now(self):
return datetime.datetime.now().replace(microsecond=0).isoformat()
def tearDown(self):
self.stream_close()
def testRequestSetOk(self):
self.stream_start(mode='component',
plugins=['xep_0030',

3
tests/test_stream_xep_0385.py
View File

@@ -14,9 +14,6 @@ class TestSIMS(SlixTest):
mode="component", jid="whatevs.shakespeare.lit", plugins={"xep_0385"}
)
def tearDown(self):
self.stream_close()
def test_set_file(self):
with NamedTemporaryFile("wb+") as f:
n = 10

3
tests/test_stream_xep_0405.py
View File

@@ -8,9 +8,6 @@ class TestMIXPAM(SlixTest):
def setUp(self):
self.stream_start(plugins=['xep_0405'])
def tearDown(self):
self.stream_close()
def testGetRosterEmpty(self):
"""Test requesting an empty annotated roster"""

2
tests/test_stream_xep_0447.py
View File

@@ -15,8 +15,6 @@ class TestStatelessFileSharing(SlixTest):
mode="component", jid="whatevs.shakespeare.lit", plugins={"xep_0447"}
)
def tearDown(self):
self.stream_close()
def test_set_file(self):
with NamedTemporaryFile("wb+") as f:

3
tests/test_stream_xep_0461.py
View File

@@ -7,9 +7,6 @@ class TestReply(SlixTest):
def setUp(self):
self.stream_start(plugins=["xep_0461"])
def tearDown(self):
self.stream_close()
def testFallBackBody(self):
async def on_reply(msg):
start = msg["feature_fallback"]["fallback_body"]["start"]

3
tests/test_tostring.py
View File

@@ -10,9 +10,6 @@ class TestToString(SlixTest):
Test the implementation of slixmpp.xmlstream.tostring
"""
def tearDown(self):
self.stream_close()
def tryTostring(self, original='', expected=None, message='', **kwargs):
"""
Compare the result of calling tostring against an