telepathy-mission-control: Use combined AutomaticPresence in tests where either would do

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 287f7425b9069fae816f1e2872b5992dffb17074
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=287f7425b9069fae816f1e2872b5992dffb17074

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 12 12:21:04 2012 +0100

Use combined AutomaticPresence in tests where either would do

---

 tests/twisted/account-manager/avatar-persist.py |    5 ++---
 tests/twisted/account-manager/avatar-refresh.py |    5 ++---
 tests/twisted/dispatcher/create-at-startup.py   |    4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/twisted/account-manager/avatar-persist.py b/tests/twisted/account-manager/avatar-persist.py
index f9c28c7..7dedb18 100644
--- a/tests/twisted/account-manager/avatar-persist.py
+++ b/tests/twisted/account-manager/avatar-persist.py
@@ -52,9 +52,8 @@ def preseed(q, bus, fake_accounts_service):
         'NormalizedName': 'jc.denton at unatco.int',
         'Enabled': True,
         'ConnectAutomatically': True,
-        'AutomaticPresenceType': dbus.UInt32(2),
-        'AutomaticPresenceStatus': 'available',
-        'AutomaticPresenceMessage': 'My vision is augmented',
+        'AutomaticPresence': (dbus.UInt32(2), 'available',
+            'My vision is augmented'),
         'Nickname': 'JC',
         'AvatarMime': 'image/jpeg',
         'avatar_token': 'Deus Ex',
diff --git a/tests/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index a6cb9e1..817a623 100644
--- a/tests/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
@@ -52,9 +52,8 @@ def preseed(q, bus, fake_accounts_service):
         'NormalizedName': 'jc.denton at unatco.int',
         'Enabled': True,
         'ConnectAutomatically': True,
-        'AutomaticPresenceType': dbus.UInt32(2),
-        'AutomaticPresenceStatus': 'available',
-        'AutomaticPresenceMessage': 'My vision is augmented',
+        'AutomaticPresence': (dbus.UInt32(2), 'available',
+            'My vision is augmented'),
         'Nickname': 'JC',
         'AvatarMime': 'image/jpeg',
         'avatar_token': 'Deus Ex',
diff --git a/tests/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py
index c3c2a17..e0d7372 100644
--- a/tests/twisted/dispatcher/create-at-startup.py
+++ b/tests/twisted/dispatcher/create-at-startup.py
@@ -49,9 +49,7 @@ def preseed(q, bus, fake_accounts_service):
         'NormalizedName': 'jc.denton at unatco.int',
         'Enabled': True,
         'ConnectAutomatically': False,
-        'AutomaticPresenceType': dbus.UInt32(2),
-        'AutomaticPresenceStatus': 'available',
-        'AutomaticPresenceMessage': '',
+        'AutomaticPresence': (dbus.UInt32(2), 'available', ''),
         })
     fake_accounts_service.update_parameters(account_id, untyped={
         'account': 'jc.denton at unatco.int',