diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-14 17:28:59 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-14 17:49:58 +0100 |
| commit | c68547b12b3371eb1c67e2640e7d0f270f5890ef (patch) | |
| tree | 01b52529d14349ab73b638bf313802d2bc8b4223 | |
| parent | 0bf6ed698102011576327856e16161cd19e1034d (diff) | |
| download | telepathy-mission-control-c68547b12b3371eb1c67e2640e7d0f270f5890ef.tar.gz | |
Run account storage tests in their own session, and not in installcheck
The gnome-keyring test assumes that it's talking to a MC instance
configured to use the temporary keyring, which won't be true unless we
run it in its own instance; the diverted-storage test makes assumptions
about account naming that aren't necessarily true in a non-new MC
instance.
Similarly, these tests use Abort() which isn't in the real MC.
| -rw-r--r-- | test/twisted/Makefile.am | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am index 4e6b6dee..94dec622 100644 --- a/test/twisted/Makefile.am +++ b/test/twisted/Makefile.am @@ -21,8 +21,6 @@ TWISTED_BASIC_TESTS = \ account-requests/cancel.py \ account-requests/create-text.py \ account-requests/delete-account-during-request.py \ - account-storage/diverted-storage.py \ - account-storage/default-keyring-storage.py \ capabilities/draft-1.py \ capabilities/contact-caps.py \ capabilities/legacy-caps.py \ @@ -67,21 +65,19 @@ TWISTED_BASIC_TESTS += \ dispatcher/dispatch-rejected-by-plugin.py endif -if ENABLE_LIBACCOUNTS_SSO -TWISTED_BASIC_TESTS += \ - account-storage/libaccounts-sso-storage.py -endif - # Tests that aren't to be run if we're running the real (installed) MC, -# because they rely on special behaviour of mc-debug-server +# because they rely on special behaviour of mc-debug-server. +# +# For simplicity, these are also separate tests: at least +# account-storage/*.py need their own instances. TWISTED_SPECIAL_BUILD_TESTS = \ - account-manager/auto-away.py + account-manager/auto-away.py \ + account-storage/default-keyring-storage.py \ + account-storage/diverted-storage.py TWISTED_SLOW_TESTS = \ account-manager/server-drops-us.py -TWISTED_BASIC_TESTS += $(TWISTED_SPECIAL_BUILD_TESTS) - TWISTED_SEPARATE_TESTS = \ account-manager/auto-connect.py \ account-manager/avatar-persist.py \ @@ -90,6 +86,13 @@ TWISTED_SEPARATE_TESTS = \ crash-recovery/crash-recovery.py \ dispatcher/create-at-startup.py +if ENABLE_LIBACCOUNTS_SSO +TWISTED_SPECIAL_BUILD_TESTS += \ + account-storage/libaccounts-sso-storage.py +endif + +TWISTED_SEPARATE_TESTS += $(TWISTED_SPECIAL_BUILD_TESTS) + AM_CFLAGS = $(ERROR_CFLAGS) # A demo dispatcher plugin (new, minimal API) |