summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-02-03 16:29:38 +0100
committerLance Stout <lancestout@gmail.com>2012-02-03 16:29:38 +0100
commitcaa967105c609537050817021a426b0a7e6d54ec (patch)
treebe3c308036d9b40c61c3486a2f941fb3e9e61582
parentd565e4be2084eee14b93c753765b82b5d0f00cd1 (diff)
downloadslixmpp-caa967105c609537050817021a426b0a7e6d54ec.tar.gz
slixmpp-caa967105c609537050817021a426b0a7e6d54ec.tar.bz2
slixmpp-caa967105c609537050817021a426b0a7e6d54ec.tar.xz
slixmpp-caa967105c609537050817021a426b0a7e6d54ec.zip
Add more XEP-0047 tests.
-rw-r--r--sleekxmpp/plugins/xep_0047/stanza.py2
-rw-r--r--tests/test_stream_xep_0047.py82
2 files changed, 83 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0047/stanza.py b/sleekxmpp/plugins/xep_0047/stanza.py
index f5b77c0e..fb0d4309 100644
--- a/sleekxmpp/plugins/xep_0047/stanza.py
+++ b/sleekxmpp/plugins/xep_0047/stanza.py
@@ -46,7 +46,7 @@ class Data(ElementBase):
self._set_attr('seq', str(value))
def get_data(self):
- b64_data = self.xml.text
+ b64_data = self.xml.text.strip()
if VALID_B64.match(b64_data).group() == b64_data:
return from_b64(b64_data)
else:
diff --git a/tests/test_stream_xep_0047.py b/tests/test_stream_xep_0047.py
index 485dafe5..d8cdd6a3 100644
--- a/tests/test_stream_xep_0047.py
+++ b/tests/test_stream_xep_0047.py
@@ -92,7 +92,89 @@ class TestInBandByteStreams(SleekTest):
self.assertEqual(events, set(['ibb_stream_start', 'callback']))
+ def testSendData(self):
+ """Test sending data over an in-band bytestream."""
+ streams = []
+ data = []
+
+ def on_stream_start(stream):
+ streams.append(stream)
+
+ def on_stream_data(d):
+ data.append(d['data'])
+
+ self.xmpp.add_event_handler('ibb_stream_start', on_stream_start)
+ self.xmpp.add_event_handler('ibb_stream_data', on_stream_data)
+
+ t = threading.Thread(name='open_stream',
+ target=self.xmpp['xep_0047'].open_stream,
+ args=('tester@localhost/receiver',),
+ kwargs={'sid': 'testing'})
+ t.start()
+
+ self.send("""
+ <iq type="set" to="tester@localhost/receiver" id="1">
+ <open xmlns="http://jabber.org/protocol/ibb"
+ sid="testing"
+ block-size="4096"
+ stanza="iq" />
+ </iq>
+ """)
+
+ self.recv("""
+ <iq type="result" id="1"
+ to="tester@localhost"
+ from="tester@localhost/receiver" />
+ """)
+
+ t.join()
+
+ time.sleep(0.2)
+
+ stream = streams[0]
+
+
+ # Test sending data out
+ stream.send("Testing")
+
+ self.send("""
+ <iq type="set" id="2"
+ from="tester@localhost"
+ to="tester@localhost/receiver">
+ <data xmlns="http://jabber.org/protocol/ibb"
+ seq="0"
+ sid="testing">
+ VGVzdGluZw==
+ </data>
+ </iq>
+ """)
+
+ self.recv("""
+ <iq type="result" id="2"
+ to="tester@localhost"
+ from="tester@localhost/receiver" />
+ """)
+
+ # Test receiving data
+ self.recv("""
+ <iq type="set" id="A"
+ to="tester@localhost"
+ from="tester@localhost/receiver">
+ <data xmlns="http://jabber.org/protocol/ibb"
+ seq="0"
+ sid="testing">
+ aXQgd29ya3Mh
+ </data>
+ </iq>
+ """)
+
+ self.send("""
+ <iq type="result" id="A"
+ to="tester@localhost/receiver" />
+ """)
+
+ self.assertEqual(data, ['it works!'])
suite = unittest.TestLoader().loadTestsFromTestCase(TestInBandByteStreams)