Use the mock accounts service for the majority of our tests

For tests that rely on special behaviour such as "preloading" keyfiles
with specific contents, don't provide the bus name of the mock accounts
service, resulting in fallback to the diverted-keyfile plugin.

11 files changed, 33 insertions, 14 deletions

diff --git a/tests/twisted/account-manager/auto-connect.py b/tests/twisted/account-manager/auto-connect.py
index 581a1b66..a789c03b 100644
--- a/tests/twisted/account-manager/auto-connect.py
+++ b/tests/twisted/account-manager/auto-connect.py
@@ -174,4 +174,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-manager/avatar-persist.py b/tests/twisted/account-manager/avatar-persist.py
index 6dfae62a..12d5b36f 100644
--- a/tests/twisted/account-manager/avatar-persist.py
+++ b/tests/twisted/account-manager/avatar-persist.py
@@ -182,4 +182,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index f3e535a9..8e196506 100644
--- a/tests/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
@@ -131,4 +131,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py
index 457229db..1dde935a 100644
--- a/tests/twisted/account-manager/make-valid.py
+++ b/tests/twisted/account-manager/make-valid.py
@@ -231,4 +231,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-manager/update-parameters.py b/tests/twisted/account-manager/update-parameters.py
index 337ea73b..9abfb76d 100644
--- a/tests/twisted/account-manager/update-parameters.py
+++ b/tests/twisted/account-manager/update-parameters.py
@@ -273,4 +273,4 @@ def test(q, bus, mc):
     assert updated
 
 if __name__ == '__main__':
-    exec_test(test, {})
+    exec_test(test, {}, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-storage/default-keyring-storage.py b/tests/twisted/account-storage/default-keyring-storage.py
index 93feca4f..903df862 100644
--- a/tests/twisted/account-storage/default-keyring-storage.py
+++ b/tests/twisted/account-storage/default-keyring-storage.py
@@ -313,5 +313,5 @@ if __name__ == '__main__':
     except OSError:
         pass
     start_gnome_keyring_daemon(ctl_dir)
-    exec_test(test, {}, timeout=10)
+    exec_test(test, {}, timeout=10, use_fake_accounts_service=False)
     stop_gnome_keyring_daemon()
diff --git a/tests/twisted/account-storage/diverted-storage.py b/tests/twisted/account-storage/diverted-storage.py
index 258b0e2b..8692b09b 100644
--- a/tests/twisted/account-storage/diverted-storage.py
+++ b/tests/twisted/account-storage/diverted-storage.py
@@ -119,4 +119,4 @@ def test(q, bus, mc):
     assert group not in kf, kf
 
 if __name__ == '__main__':
-    exec_test(test, {}, timeout=10)
+    exec_test(test, {}, timeout=10, use_fake_accounts_service=False)
diff --git a/tests/twisted/account-storage/libaccounts-sso-storage.py b/tests/twisted/account-storage/libaccounts-sso-storage.py
index af2455e4..a2e7b512 100644
--- a/tests/twisted/account-storage/libaccounts-sso-storage.py
+++ b/tests/twisted/account-storage/libaccounts-sso-storage.py
@@ -86,4 +86,4 @@ def test(q, bus, mc):
 if __name__ == '__main__':
     ctl_dir = os.environ['ACCOUNTS']
     prepare_accounts_db(ctl_dir)
-    exec_test(test, {}, timeout=10)
+    exec_test(test, {}, timeout=10, use_fake_accounts_service=False)
diff --git a/tests/twisted/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py
index 0446550c..c3da6de2 100644
--- a/tests/twisted/crash-recovery/crash-recovery.py
+++ b/tests/twisted/crash-recovery/crash-recovery.py
@@ -125,4 +125,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py
index 992145fb..c5a139aa 100644
--- a/tests/twisted/dispatcher/create-at-startup.py
+++ b/tests/twisted/dispatcher/create-at-startup.py
@@ -235,4 +235,4 @@ def test(q, bus, unused):
 
 if __name__ == '__main__':
     preseed()
-    exec_test(test, {}, preload_mc=False)
+    exec_test(test, {}, preload_mc=False, use_fake_accounts_service=False)
diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py
index be187d6b..46363c15 100644
--- a/tests/twisted/mctest.py
+++ b/tests/twisted/mctest.py
@@ -33,6 +33,7 @@ from twisted.internet import reactor
 import dbus
 import dbus.service
 
+from fakeaccountsservice import FakeAccountsService
 from fakeconnectivity import FakeConnectivity
 
 def install_colourer():
@@ -104,7 +105,8 @@ class MC(dbus.proxies.ProxyObject):
         return events[3:]
 
 def exec_test_deferred (fun, params, protocol=None, timeout=None,
-        preload_mc=True, initially_online=True):
+        preload_mc=True, initially_online=True, use_fake_accounts_service=True,
+        pass_kwargs=False):
     colourer = None
 
     if sys.stdout.isatty():
@@ -129,8 +131,24 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None,
     else:
         mc = None
 
+    if use_fake_accounts_service:
+        fake_accounts_service = FakeAccountsService(queue, bus)
+
+        if preload_mc:
+            queue.expect('dbus-signal',
+                    path=cs.TEST_DBUS_ACCOUNT_PLUGIN_PATH,
+                    interface=cs.TEST_DBUS_ACCOUNT_PLUGIN_IFACE,
+                    signal='Active')
+    else:
+        fake_accounts_service = None
+
+    if pass_kwargs:
+        kwargs=dict(fake_accounts_service=fake_accounts_service)
+    else:
+        kwargs=dict()
+
     try:
-        fun(queue, bus, mc)
+        fun(queue, bus, mc, **kwargs)
     except Exception, e:
         import traceback
         traceback.print_exc()
@@ -185,9 +203,10 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None,
       sys.stdout = colourer.fh
 
 def exec_test(fun, params=None, protocol=None, timeout=None,
-              preload_mc=True, initially_online=True):
+              preload_mc=True, initially_online=True,
+              use_fake_accounts_service=True, pass_kwargs=False):
   reactor.callWhenRunning (exec_test_deferred, fun, params, protocol, timeout,
-          preload_mc, initially_online)
+          preload_mc, initially_online, use_fake_accounts_service, pass_kwargs)
   reactor.run()
 
 class SimulatedConnection(object):