summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEitan Isaacson <eitan@monotonous.org>2010-10-14 11:15:20 -0700
committerWill Thompson <will.thompson@collabora.co.uk>2010-10-22 12:08:34 +0100
commit4f66208343c29226bdb549c2b1d6d15cd2ab985e (patch)
tree96c6bc041d0013fb6f915ddd6f90405b5aaa89cb
parent2a295d1d37ff7a092c185e07a338924977e2d565 (diff)
Add hybrid (XEP-0126 & XEP-0186) service to initial presence test.
-rw-r--r--tests/twisted/presence/initial-presence.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/twisted/presence/initial-presence.py b/tests/twisted/presence/initial-presence.py
index 11e97a9aa..84a69534b 100644
--- a/tests/twisted/presence/initial-presence.py
+++ b/tests/twisted/presence/initial-presence.py
@@ -9,7 +9,8 @@ from gabbletest import exec_test
from servicetest import EventPattern, assertEquals, assertNotEquals
import ns
import constants as cs
-from invisible_helper import ValidInvisibleListStream, Xep0186XmlStream
+from invisible_helper import ValidInvisibleListStream, Xep0186Stream, \
+ Xep0186AndValidInvisibleListStream
def test(q, bus, conn, stream):
props = conn.Properties.GetAll(cs.CONN_IFACE_SIMPLE_PRESENCE)
@@ -31,5 +32,6 @@ def test(q, bus, conn, stream):
if __name__ == '__main__':
exec_test(test)
- exec_test(test, protocol=ValidInvisibleListStream)
- exec_test(test, protocol=Xep0186XmlStream)
+ for protocol in [ValidInvisibleListStream, Xep0186Stream,
+ Xep0186AndValidInvisibleListStream]:
+ exec_test(test, protocol=protocol)