[telepathy-gabble/master] Expunge expect_racy from the test suite.

[Will Thompson]

---
 tests/twisted/jingle/test-dialects-incoming.py |   17 +++++++++--------
 tests/twisted/jingle/test-dialects-outgoing.py |   17 ++++++++---------
 tests/twisted/servicetest.py                   |   19 -------------------
 3 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/tests/twisted/jingle/test-dialects-incoming.py b/tests/twisted/jingle/test-dialects-incoming.py
index a1bdf51..f025485 100644
--- a/tests/twisted/jingle/test-dialects-incoming.py
+++ b/tests/twisted/jingle/test-dialects-incoming.py
@@ -2,7 +2,7 @@
 Test incoming call handling.
 """
 
-from servicetest import make_channel_proxy, tp_path_prefix
+from servicetest import make_channel_proxy, tp_path_prefix, EventPattern
 import constants as cs
 from jingletest2 import JingleTest2, test_all_dialects
 
@@ -42,13 +42,14 @@ def worker(jp, q, bus, conn, stream):
     media_chan.AddMembers([self_handle], 'accepted')
 
     # S-E gets notified about a newly-created stream
-    e = q.expect('dbus-signal', signal='NewStreamHandler')
+    new_stream_handler, _ = q.expect_many(
+        EventPattern('dbus-signal', signal='NewStreamHandler'),
+        EventPattern('dbus-signal', signal='MembersChanged',
+             args=[u'', [self_handle], [], [], [], self_handle, 0]),
+        )
 
-    stream_handler = make_channel_proxy(conn, e.args[0], 'Media.StreamHandler')
-
-    # We are now in members too
-    e = q.expect_racy('dbus-signal', signal='MembersChanged',
-             args=[u'', [self_handle], [], [], [], self_handle, 0])
+    stream_handler = make_channel_proxy(conn, new_stream_handler.args[0],
+        'Media.StreamHandler')
 
     # we are now both in members
     members = media_chan.GetMembers()
@@ -61,7 +62,7 @@ def worker(jp, q, bus, conn, stream):
     # In gtalk4, first one will be transport-accept, telling us that GTalk
     # is ok with our choice of transports.
     if jp.dialect == 'gtalk-v0.4':
-        e = q.expect_racy('stream-iq', predicate=lambda x:
+        e = q.expect('stream-iq', predicate=lambda x:
             xpath.queryForNodes("/iq/session[@type='transport-accept']",
                 x.stanza))
 
diff --git a/tests/twisted/jingle/test-dialects-outgoing.py b/tests/twisted/jingle/test-dialects-outgoing.py
index 201fbce..f262e58 100644
--- a/tests/twisted/jingle/test-dialects-outgoing.py
+++ b/tests/twisted/jingle/test-dialects-outgoing.py
@@ -84,22 +84,21 @@ def worker(jp, q, bus, conn, stream):
 
     group_iface.RemoveMembers([dbus.UInt32(1)], 'closed')
 
-    # Test completed, close the connection
-
-    q.flush_past_events()
-
-    e = q.expect('dbus-signal', signal='Close') #XXX - match against the path
-
-    # Make sure gabble sent proper terminate action
+    # Make sure gabble sends proper terminate action
     if jp.dialect.startswith('gtalk'):
-        e = q.expect_racy('stream-iq', predicate=lambda x:
+        terminate = EventPattern('stream-iq', predicate=lambda x:
             xpath.queryForNodes("/iq/session[@type='terminate']",
                 x.stanza))
     else:
-        e = q.expect_racy('stream-iq', predicate=lambda x:
+        terminate = EventPattern('stream-iq', predicate=lambda x:
             xpath.queryForNodes("/iq/jingle[@action='session-terminate']",
                 x.stanza))
 
+    q.expect_many(
+        EventPattern('dbus-signal', signal='Close'),
+        terminate,
+        )
+
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
 
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index 80baa53..29bb69f 100644
--- a/tests/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
@@ -72,7 +72,6 @@ class BaseEventQueue:
 
     def __init__(self, timeout=None):
         self.verbose = False
-        self.past_events = []
         self.forbidden_events = set()
 
         if timeout is None:
@@ -84,22 +83,6 @@ class BaseEventQueue:
         if self.verbose:
             print s
 
-    def flush_past_events(self):
-        self.past_events = []
-
-    def expect_racy(self, type, **kw):
-        pattern = EventPattern(type, **kw)
-
-        for event in self.past_events:
-            if pattern.match(event):
-                self.log('past event handled')
-                map(self.log, format_event(event))
-                self.log('')
-                self.past_events.remove(event)
-                return event
-
-        return self.expect(type, **kw)
-
     def forbid_events(self, patterns):
         """
         Add patterns (an iterable of EventPattern) to the set of forbidden
@@ -139,7 +122,6 @@ class BaseEventQueue:
                 self.log('')
                 return event
 
-            self.past_events.append(event)
             self.log('not handled')
             self.log('')
 
@@ -160,7 +142,6 @@ class BaseEventQueue:
                     ret[i] = event
                     break
             else:
-                self.past_events.append(event)
                 self.log('not handled')
                 self.log('')
 
-- 
1.5.6.5