[Telepathy-commits] [telepathy-idle/master] Fix some more minor twisted test issues

[Jonathon Jongsma]

- Use expect_many() rather than expect_racy() (the latter was accidentally
  committed after I was playing around with it and didn't know exactly what it
  did).
- Fix the signature of BaseIRCServer.connectionLost.
- Fix some formatting (tabs vs. spaces) issues
- a little more debug information to help me figure out what's going on.
---
 tests/twisted/Makefile.am                    |    4 ++--
 tests/twisted/connect/connect-fail-ssl.py    |    8 ++++----
 tests/twisted/connect/connect-fail.py        |    6 +++---
 tests/twisted/connect/connect-success-ssl.py |    6 ++++--
 tests/twisted/connect/connect-success.py     |    6 ++++--
 tests/twisted/idletest.py                    |    6 ++++--
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 5180cf5..29271ee 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,8 +1,8 @@
 TWISTED_TESTS = \
-		connect/connect-fail.py \
-		connect/connect-fail-ssl.py \
 		connect/connect-success.py \
 		connect/connect-success-ssl.py \
+		connect/connect-fail.py \
+		connect/connect-fail-ssl.py \
 		$(NULL)
 
 TESTS =
diff --git a/tests/twisted/connect/connect-fail-ssl.py b/tests/twisted/connect/connect-fail-ssl.py
index 14d1ae9..4e0816c 100644
--- a/tests/twisted/connect/connect-fail-ssl.py
+++ b/tests/twisted/connect/connect-fail-ssl.py
@@ -7,10 +7,10 @@ import dbus
 from idletest import exec_test, SSLIRCServer
 
 def test(q, bus, conn, stream):
-	conn.Connect()
-	q.expect('dbus-signal', signal='StatusChanged', args=[1,1])
-	q.expect('dbus-signal', signal='StatusChanged', args=[2,2])
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[1,1])
+    q.expect('dbus-signal', signal='StatusChanged', args=[2,2])
 
 if __name__ == '__main__':
-    exec_test(test, {'port': dbus.UInt32(5600), 'use-ssl': dbus.Boolean(True)}, protocol=SSLIRCServer)
+    exec_test(test, {'port': dbus.UInt32(5600), 'use-ssl': dbus.Boolean(True)}, timeout=10)
 
diff --git a/tests/twisted/connect/connect-fail.py b/tests/twisted/connect/connect-fail.py
index e7c121f..8d50a9c 100644
--- a/tests/twisted/connect/connect-fail.py
+++ b/tests/twisted/connect/connect-fail.py
@@ -7,9 +7,9 @@ import dbus
 from idletest import exec_test
 
 def test(q, bus, conn, stream):
-	conn.Connect()
-	q.expect('dbus-signal', signal='StatusChanged', args=[1,1])
-	q.expect('dbus-signal', signal='StatusChanged', args=[2,2])
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[1,1])
+    q.expect('dbus-signal', signal='StatusChanged', args=[2,2])
 
 if __name__ == '__main__':
     exec_test(test, {'port': dbus.UInt32(5600)})
diff --git a/tests/twisted/connect/connect-success-ssl.py b/tests/twisted/connect/connect-success-ssl.py
index 12367e5..5fba542 100644
--- a/tests/twisted/connect/connect-success-ssl.py
+++ b/tests/twisted/connect/connect-success-ssl.py
@@ -5,11 +5,13 @@ Test connecting to a SSL server.
 
 import dbus
 from idletest import exec_test, SSLIRCServer
+from servicetest import EventPattern
 
 def test(q, bus, conn, stream):
     conn.Connect()
-    q.expect_racy('dbus-signal', signal='StatusChanged', args=[1, 1])
-    q.expect_racy('irc-connected')
+    q.expect_many(
+            EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
+            EventPattern('irc-connected'))
     q.expect('dbus-signal', signal='SelfHandleChanged',
         args=[1L])
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
diff --git a/tests/twisted/connect/connect-success.py b/tests/twisted/connect/connect-success.py
index c94bc4d..70f4f62 100644
--- a/tests/twisted/connect/connect-success.py
+++ b/tests/twisted/connect/connect-success.py
@@ -4,11 +4,13 @@ Test connecting to a server.
 """
 
 from idletest import exec_test
+from servicetest import EventPattern
 
 def test(q, bus, conn, stream):
     conn.Connect()
-    q.expect_racy('dbus-signal', signal='StatusChanged', args=[1, 1])
-    q.expect_racy('irc-connected')
+    q.expect_many(
+            EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
+            EventPattern('irc-connected'))
     q.expect('dbus-signal', signal='SelfHandleChanged',
         args=[1L])
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
diff --git a/tests/twisted/idletest.py b/tests/twisted/idletest.py
index 74a368a..fe8a88e 100644
--- a/tests/twisted/idletest.py
+++ b/tests/twisted/idletest.py
@@ -33,14 +33,15 @@ class BaseIRCServer(irc.IRC):
         self.require_pass = False
 
     def listen(self, port, factory):
+        print ("BaseIRCServer listening...")
         return reactor.listenTCP(port, factory)
 
     def connectionMade(self):
         print ("connection Made")
         self.event_func(make_connected_event())
 
-    def connectionLost(self):
-        print ("connection Lost")
+    def connectionLost(self, reason):
+        print ("connection Lost  %s" % reason)
         self.event_func(make_disconnected_event())
 
     def dataReceived(self, data):
@@ -67,6 +68,7 @@ class BaseIRCServer(irc.IRC):
 
 class SSLIRCServer(BaseIRCServer):
     def listen(self, port, factory):
+        print ("SSLIRCServer listening...")
         return reactor.listenSSL(port, factory,
                 ssl.DefaultOpenSSLContextFactory("tools/idletest.key",
                     "tools/idletest.cert"))
-- 
1.5.6.5