diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
| commit | a278f79bdbdb842193092a9e0176ecb8b1867762 (patch) | |
| tree | c55be3e45f61133c01969be201d3a6476dbe5762 /tests/test_stanza_xep_0060.py | |
| parent | 606c369173e7a31d793540d90e425a78c2a81253 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.gz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.bz2 slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.xz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'tests/test_stanza_xep_0060.py')
| -rw-r--r-- | tests/test_stanza_xep_0060.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_stanza_xep_0060.py b/tests/test_stanza_xep_0060.py index 5d455236..8e6e820d 100644 --- a/tests/test_stanza_xep_0060.py +++ b/tests/test_stanza_xep_0060.py @@ -181,7 +181,7 @@ class TestPubsubStanzas(SleekTest): <pubsub xmlns="http://jabber.org/protocol/pubsub"> <subscribe node="cheese" jid="fritzy@netflint.net/sleekxmpp"> <options node="cheese" jid="fritzy@netflint.net/sleekxmpp"> - <x xmlns="jabber:x:data" type="form"> + <x xmlns="jabber:x:data" type="submit"> <field var="pubsub#title" type="text-single"> <value>this thing is awesome</value> </field> |