[telepathy-mission-control/master] account-manager/auto-connect.py: be robust against MC being very slow

[Simon McVittie]

These changes are necessary for the test to pass under valgrind.
---
 test/twisted/account-manager/auto-connect.py |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/twisted/account-manager/auto-connect.py b/test/twisted/account-manager/auto-connect.py
index c5bf05c..90abbae 100644
--- a/test/twisted/account-manager/auto-connect.py
+++ b/test/twisted/account-manager/auto-connect.py
@@ -63,11 +63,13 @@ def test(q, bus, mc):
 
     e, _ = q.expect_many(
             EventPattern('dbus-signal', signal='AccountPropertyChanged',
-                path=account_path, interface=cs.ACCOUNT),
+                path=account_path, interface=cs.ACCOUNT,
+                predicate=(lambda e: e.args[0].get('ConnectionStatus') ==
+                    cs.CONN_STATUS_CONNECTING)),
             EventPattern('dbus-method-call', method='Connect',
                 path=conn.object_path, handled=True, interface=cs.CONN),
             )
-    assert e.args[0]['Connection'] == conn.object_path
+    assert e.args[0].get('Connection') in (conn.object_path, None)
     assert e.args[0]['ConnectionStatus'] == cs.CONN_STATUS_CONNECTING
     assert e.args[0]['ConnectionStatusReason'] == \
             cs.CONN_STATUS_REASON_REQUESTED
@@ -83,16 +85,17 @@ def test(q, bus, mc):
                 interface=cs.CONN_IFACE_SIMPLE_PRESENCE, method='SetPresence',
                 handled=False),
             EventPattern('dbus-signal', signal='AccountPropertyChanged',
-                path=account_path, interface=cs.ACCOUNT),
+                path=account_path, interface=cs.ACCOUNT,
+                predicate=lambda e: 'ConnectionStatus' in e.args[0]),
             )
 
     assert e.args[0]['ConnectionStatus'] == cs.CONN_STATUS_CONNECTED
-    assert e.args[0]['HasBeenOnline'] == True
 
     q.dbus_return(set_presence.message, signature='')
 
     e = q.expect('dbus-signal', signal='AccountPropertyChanged',
-            path=account_path, interface=cs.ACCOUNT)
+            path=account_path, interface=cs.ACCOUNT,
+            predicate=lambda e: 'CurrentPresence' in e.args[0])
     assert e.args[0]['CurrentPresence'] == (cs.PRESENCE_TYPE_AVAILABLE,
             'available', 'My vision is augmented')
 
-- 
1.5.6.5