[telepathy-mission-control/master] Alter tests to catch up with mardy's ConnectionStatusReason change

[Simon McVittie]

Because CSR is initially REQUESTED now, there is no change when we start
CONNECTING, so it's omitted from the signal.
---
 test/twisted/account-manager/auto-connect.py   |    4 ++--
 test/twisted/account-manager/avatar-persist.py |    2 --
 test/twisted/account-manager/avatar-refresh.py |    2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/twisted/account-manager/auto-connect.py b/test/twisted/account-manager/auto-connect.py
index b1f509d..c6ebda0 100644
--- a/test/twisted/account-manager/auto-connect.py
+++ b/test/twisted/account-manager/auto-connect.py
@@ -97,8 +97,8 @@ def test(q, bus, mc):
             )
     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
+    assert e.args[0].get('ConnectionStatusReason') in \
+            (cs.CONN_STATUS_REASON_REQUESTED, None)
 
     print "becoming connected"
     conn.StatusChanged(cs.CONN_STATUS_CONNECTED, cs.CONN_STATUS_REASON_NONE)
diff --git a/test/twisted/account-manager/avatar-persist.py b/test/twisted/account-manager/avatar-persist.py
index 12f22f2..3629ecd 100644
--- a/test/twisted/account-manager/avatar-persist.py
+++ b/test/twisted/account-manager/avatar-persist.py
@@ -101,8 +101,6 @@ def test(q, bus, mc):
             )
     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
 
     conn.StatusChanged(cs.CONN_STATUS_CONNECTED, cs.CONN_STATUS_REASON_NONE)
 
diff --git a/test/twisted/account-manager/avatar-refresh.py b/test/twisted/account-manager/avatar-refresh.py
index 967fa9e..00bd127 100644
--- a/test/twisted/account-manager/avatar-refresh.py
+++ b/test/twisted/account-manager/avatar-refresh.py
@@ -99,8 +99,6 @@ def test(q, bus, mc):
             )
     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
 
     conn.StatusChanged(cs.CONN_STATUS_CONNECTED, cs.CONN_STATUS_REASON_NONE)
 
-- 
1.5.6.5