summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-14 17:58:58 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-14 17:58:58 +0100
commit3790a84acb18bf61d85a5a79b4ea4a30b1649986 (patch)
treebeab08b97f08ad3bd36aa50283b436bd65a1c075
parentc68547b12b3371eb1c67e2640e7d0f270f5890ef (diff)
downloadtelepathy-mission-control-3790a84acb18bf61d85a5a79b4ea4a30b1649986.tar.gz
Knock out the account-storage/libaccounts-sso-storage test for 5.6
I'm unable to test it and it looks unfinished.
-rw-r--r--test/twisted/Makefile.am5
-rw-r--r--test/twisted/account-storage/libaccounts-sso-storage.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 94dec622..7b242ffe 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -86,11 +86,6 @@ 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)
diff --git a/test/twisted/account-storage/libaccounts-sso-storage.py b/test/twisted/account-storage/libaccounts-sso-storage.py
index 9d410f1d..c6b68b6c 100644
--- a/test/twisted/account-storage/libaccounts-sso-storage.py
+++ b/test/twisted/account-storage/libaccounts-sso-storage.py
@@ -16,6 +16,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA
+raise AssertionError('Disabled for 5.6 branch')
+
import time
import os
import os.path