summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-22 15:54:58 (GMT)
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-22 15:54:58 (GMT)
commit5b34520e25c014377a27f22d35b958ded994a2dd (patch)
treeb3c3c0eb6e0d39d85ce823db1a35d3c317571c7e
parent1d9f17613ac2ce1dc3928ab0848d7b9b987b6330 (diff)
downloadtelepathy-mission-control-5b34520e25c014377a27f22d35b958ded994a2dd.tar.gz
telepathy-mission-control-5b34520e25c014377a27f22d35b958ded994a2dd.tar.xz
tests: move from test/ to tests/
So so annoying. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--.gitignore34
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--test/twisted/tools/Client.AbiWord.service.in3
-rw-r--r--test/twisted/tools/Client.Logger.service.in3
-rw-r--r--tests/Makefile.am (renamed from test/Makefile.am)0
-rw-r--r--tests/account-store-default.c (renamed from test/account-store-default.c)0
-rw-r--r--tests/account-store-default.h (renamed from test/account-store-default.h)0
-rw-r--r--tests/account-store-libaccounts.c (renamed from test/account-store-libaccounts.c)0
-rw-r--r--tests/account-store-libaccounts.h (renamed from test/account-store-libaccounts.h)0
-rw-r--r--tests/account-store.c (renamed from test/account-store.c)0
-rw-r--r--tests/keyring-command.c (renamed from test/keyring-command.c)0
-rw-r--r--tests/twisted/Makefile.am (renamed from test/twisted/Makefile.am)28
-rw-r--r--tests/twisted/README (renamed from test/twisted/README)6
-rw-r--r--tests/twisted/account-manager/account-basics.py (renamed from test/twisted/account-manager/account-basics.py)0
-rw-r--r--tests/twisted/account-manager/auto-away.py (renamed from test/twisted/account-manager/auto-away.py)0
-rw-r--r--tests/twisted/account-manager/auto-connect.py (renamed from test/twisted/account-manager/auto-connect.py)0
-rw-r--r--tests/twisted/account-manager/avatar-persist.py (renamed from test/twisted/account-manager/avatar-persist.py)0
-rw-r--r--tests/twisted/account-manager/avatar-refresh.py (renamed from test/twisted/account-manager/avatar-refresh.py)0
-rw-r--r--tests/twisted/account-manager/avatar.py (renamed from test/twisted/account-manager/avatar.py)0
-rw-r--r--tests/twisted/account-manager/bad-cm.py (renamed from test/twisted/account-manager/bad-cm.py)0
-rw-r--r--tests/twisted/account-manager/create-auto-connect.py (renamed from test/twisted/account-manager/create-auto-connect.py)0
-rw-r--r--tests/twisted/account-manager/create-twice.py (renamed from test/twisted/account-manager/create-twice.py)0
-rw-r--r--tests/twisted/account-manager/create-with-properties.py (renamed from test/twisted/account-manager/create-with-properties.py)0
-rw-r--r--tests/twisted/account-manager/device-idle.py (renamed from test/twisted/account-manager/device-idle.py)0
-rw-r--r--tests/twisted/account-manager/enable-auto-connect.py (renamed from test/twisted/account-manager/enable-auto-connect.py)0
-rw-r--r--tests/twisted/account-manager/enable.py (renamed from test/twisted/account-manager/enable.py)0
-rw-r--r--tests/twisted/account-manager/make-valid.py (renamed from test/twisted/account-manager/make-valid.py)0
-rw-r--r--tests/twisted/account-manager/nickname.py (renamed from test/twisted/account-manager/nickname.py)0
-rw-r--r--tests/twisted/account-manager/param-types.py (renamed from test/twisted/account-manager/param-types.py)0
-rwxr-xr-xtests/twisted/account-manager/presence.py (renamed from test/twisted/account-manager/presence.py)0
-rw-r--r--tests/twisted/account-manager/reconnect.py (renamed from test/twisted/account-manager/reconnect.py)0
-rw-r--r--tests/twisted/account-manager/recover-from-disconnect.py (renamed from test/twisted/account-manager/recover-from-disconnect.py)0
-rw-r--r--tests/twisted/account-manager/request-online.py (renamed from test/twisted/account-manager/request-online.py)0
-rw-r--r--tests/twisted/account-manager/server-drops-us.py (renamed from test/twisted/account-manager/server-drops-us.py)0
-rw-r--r--tests/twisted/account-manager/service.py (renamed from test/twisted/account-manager/service.py)0
-rw-r--r--tests/twisted/account-manager/update-parameters.py (renamed from test/twisted/account-manager/update-parameters.py)0
-rw-r--r--tests/twisted/account-requests/cancel.py (renamed from test/twisted/account-requests/cancel.py)0
-rw-r--r--tests/twisted/account-requests/create-text.py (renamed from test/twisted/account-requests/create-text.py)0
-rw-r--r--tests/twisted/account-requests/delete-account-during-request.py (renamed from test/twisted/account-requests/delete-account-during-request.py)0
-rw-r--r--tests/twisted/account-storage/default-keyring-storage.py (renamed from test/twisted/account-storage/default-keyring-storage.py)0
-rw-r--r--tests/twisted/account-storage/diverted-storage.py (renamed from test/twisted/account-storage/diverted-storage.py)0
-rw-r--r--tests/twisted/account-storage/libaccounts-sso-storage.py (renamed from test/twisted/account-storage/libaccounts-sso-storage.py)0
-rwxr-xr-xtests/twisted/account/addressing.py (renamed from test/twisted/account/addressing.py)0
-rw-r--r--tests/twisted/accounts/README (renamed from test/twisted/accounts/README)0
-rw-r--r--tests/twisted/capabilities/contact-caps.py (renamed from test/twisted/capabilities/contact-caps.py)0
-rw-r--r--tests/twisted/capabilities/draft-1.py (renamed from test/twisted/capabilities/draft-1.py)0
-rw-r--r--tests/twisted/capabilities/legacy-caps.py (renamed from test/twisted/capabilities/legacy-caps.py)0
-rw-r--r--tests/twisted/chandlers/README (renamed from test/twisted/chandlers/README)0
-rw-r--r--tests/twisted/constants.py (renamed from test/twisted/constants.py)0
-rw-r--r--tests/twisted/crash-recovery/crash-recovery.py (renamed from test/twisted/crash-recovery/crash-recovery.py)0
-rw-r--r--tests/twisted/dispatcher/already-has-channel.py (renamed from test/twisted/dispatcher/already-has-channel.py)0
-rw-r--r--tests/twisted/dispatcher/already-has-obsolete.py (renamed from test/twisted/dispatcher/already-has-obsolete.py)0
-rw-r--r--tests/twisted/dispatcher/approver-fails.py (renamed from test/twisted/dispatcher/approver-fails.py)0
-rw-r--r--tests/twisted/dispatcher/bypass-approval.py (renamed from test/twisted/dispatcher/bypass-approval.py)0
-rw-r--r--tests/twisted/dispatcher/bypass-observers.py (renamed from test/twisted/dispatcher/bypass-observers.py)0
-rw-r--r--tests/twisted/dispatcher/cancel.py (renamed from test/twisted/dispatcher/cancel.py)0
-rw-r--r--tests/twisted/dispatcher/capture-bundle.py (renamed from test/twisted/dispatcher/capture-bundle.py)0
-rw-r--r--tests/twisted/dispatcher/connect-for-request.py (renamed from test/twisted/dispatcher/connect-for-request.py)0
-rw-r--r--tests/twisted/dispatcher/create-at-startup.py (renamed from test/twisted/dispatcher/create-at-startup.py)0
-rw-r--r--tests/twisted/dispatcher/create-delayed-by-mini-plugin.py (renamed from test/twisted/dispatcher/create-delayed-by-mini-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/create-delayed-by-plugin.py (renamed from test/twisted/dispatcher/create-delayed-by-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/create-handler-fails.py (renamed from test/twisted/dispatcher/create-handler-fails.py)0
-rw-r--r--tests/twisted/dispatcher/create-hints.py (renamed from test/twisted/dispatcher/create-hints.py)0
-rw-r--r--tests/twisted/dispatcher/create-no-preferred-handler.py (renamed from test/twisted/dispatcher/create-no-preferred-handler.py)0
-rw-r--r--tests/twisted/dispatcher/create-rejected-by-mini-plugin.py (renamed from test/twisted/dispatcher/create-rejected-by-mini-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/create-text.py (renamed from test/twisted/dispatcher/create-text.py)0
-rw-r--r--tests/twisted/dispatcher/created-behind-our-back.py (renamed from test/twisted/dispatcher/created-behind-our-back.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-activatable.py (renamed from test/twisted/dispatcher/dispatch-activatable.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-before-connected.py (renamed from test/twisted/dispatcher/dispatch-before-connected.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py (renamed from test/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-delayed-by-plugin.py (renamed from test/twisted/dispatcher/dispatch-delayed-by-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-obsolete.py (renamed from test/twisted/dispatcher/dispatch-obsolete.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py (renamed from test/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-rejected-by-plugin.py (renamed from test/twisted/dispatcher/dispatch-rejected-by-plugin.py)0
-rw-r--r--tests/twisted/dispatcher/dispatch-text.py (renamed from test/twisted/dispatcher/dispatch-text.py)0
-rw-r--r--tests/twisted/dispatcher/ensure-and-redispatch.py (renamed from test/twisted/dispatcher/ensure-and-redispatch.py)0
-rw-r--r--tests/twisted/dispatcher/ensure-is-approval.py (renamed from test/twisted/dispatcher/ensure-is-approval.py)0
-rw-r--r--tests/twisted/dispatcher/ensure-rapidly.py (renamed from test/twisted/dispatcher/ensure-rapidly.py)0
-rw-r--r--tests/twisted/dispatcher/exploding-bundles.py (renamed from test/twisted/dispatcher/exploding-bundles.py)0
-rw-r--r--tests/twisted/dispatcher/fdo-21034.py (renamed from test/twisted/dispatcher/fdo-21034.py)0
-rw-r--r--tests/twisted/dispatcher/handle-channels-fails.py (renamed from test/twisted/dispatcher/handle-channels-fails.py)0
-rw-r--r--tests/twisted/dispatcher/lose-text.py (renamed from test/twisted/dispatcher/lose-text.py)0
-rw-r--r--tests/twisted/dispatcher/recover-from-disconnect.py (renamed from test/twisted/dispatcher/recover-from-disconnect.py)0
-rw-r--r--tests/twisted/dispatcher/request-disabled-account.py (renamed from test/twisted/dispatcher/request-disabled-account.py)0
-rw-r--r--tests/twisted/dispatcher/respawn-activatable-observers.py (renamed from test/twisted/dispatcher/respawn-activatable-observers.py)0
-rw-r--r--tests/twisted/dispatcher/respawn-observers.py (renamed from test/twisted/dispatcher/respawn-observers.py)0
-rw-r--r--tests/twisted/dispatcher/undispatchable.py (renamed from test/twisted/dispatcher/undispatchable.py)0
-rw-r--r--tests/twisted/dispatcher/vanishing-client.py (renamed from test/twisted/dispatcher/vanishing-client.py)0
-rw-r--r--tests/twisted/fakeclient.py (renamed from test/twisted/fakeclient.py)0
-rw-r--r--tests/twisted/fakecm.py (renamed from test/twisted/fakecm.py)0
-rw-r--r--tests/twisted/mc-debug-server.c (renamed from test/twisted/mc-debug-server.c)0
-rw-r--r--tests/twisted/mcp-account-diversion.c (renamed from test/twisted/mcp-account-diversion.c)0
-rw-r--r--tests/twisted/mcp-dbus-caller-permission.c (renamed from test/twisted/mcp-dbus-caller-permission.c)0
-rw-r--r--tests/twisted/mcp-plugin.c (renamed from test/twisted/mcp-plugin.c)0
-rw-r--r--tests/twisted/mctest.py (renamed from test/twisted/mctest.py)0
-rw-r--r--tests/twisted/servicetest.py (renamed from test/twisted/servicetest.py)0
-rw-r--r--tests/twisted/telepathy/clients/AbiWord.client (renamed from test/twisted/telepathy/clients/AbiWord.client)0
-rw-r--r--tests/twisted/telepathy/clients/Logger.client (renamed from test/twisted/telepathy/clients/Logger.client)0
-rw-r--r--tests/twisted/telepathy/clients/README (renamed from test/twisted/telepathy/clients/README)0
-rw-r--r--tests/twisted/telepathy/managers/README (renamed from test/twisted/telepathy/managers/README)0
-rw-r--r--tests/twisted/telepathy/managers/fakecm.manager (renamed from test/twisted/telepathy/managers/fakecm.manager)0
-rw-r--r--tests/twisted/telepathy/managers/onewitheverything.manager (renamed from test/twisted/telepathy/managers/onewitheverything.manager)0
-rw-r--r--tests/twisted/test-plugin.c (renamed from test/twisted/test-plugin.c)0
-rw-r--r--tests/twisted/tools/Client.AbiWord.service.in3
-rw-r--r--tests/twisted/tools/Client.Logger.service.in3
-rw-r--r--tests/twisted/tools/Makefile.am (renamed from test/twisted/tools/Makefile.am)0
-rw-r--r--tests/twisted/tools/MissionControl5.service.in (renamed from test/twisted/tools/MissionControl5.service.in)2
-rw-r--r--tests/twisted/tools/exec-with-log.sh.in (renamed from test/twisted/tools/exec-with-log.sh.in)6
-rw-r--r--tests/twisted/tools/fake-startup.sh (renamed from test/twisted/tools/fake-startup.sh)0
-rw-r--r--tests/twisted/tools/tmp-session-bus.conf.in (renamed from test/twisted/tools/tmp-session-bus.conf.in)2
-rw-r--r--tests/twisted/tools/valgrind.supp (renamed from test/twisted/tools/valgrind.supp)0
-rw-r--r--tests/twisted/tools/with-session-bus.sh (renamed from test/twisted/tools/with-session-bus.sh)0
-rw-r--r--tests/value-is-same.c (renamed from test/value-is-same.c)0
114 files changed, 49 insertions, 49 deletions
diff --git a/.gitignore b/.gitignore
index 11f5922..7003d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,24 +73,24 @@ stamp-*
tags
TAGS
/telepathy-mission-control-5*
-/test/account-store
-/test/keyring-command
-/test/test-*
-test/mc-client
-test/twisted/with-session-bus-*.dbus-monitor-logs
-/test/twisted/accounts/.mc_connections
-/test/twisted/accounts/accounts.cfg
-/test/twisted/mc-debug-server
-test/twisted/tools/exec-with-log.sh
-test/twisted/tools/missioncontrol-*.log
-test/twisted/tools/missioncontrol.log
-test/twisted/tools/tmp-session-bus.conf
-/test/twisted/tools/*.service
-/test/twisted/tmp-*/
-/test/twisted/with-session-bus-*.address
-/test/twisted/with-session-bus-*.pid
+/tests/account-store
+/tests/keyring-command
+/tests/test-*
+tests/mc-client
+tests/twisted/with-session-bus-*.dbus-monitor-logs
+/tests/twisted/accounts/.mc_connections
+/tests/twisted/accounts/accounts.cfg
+/tests/twisted/mc-debug-server
+tests/twisted/tools/exec-with-log.sh
+tests/twisted/tools/missioncontrol-*.log
+tests/twisted/tools/missioncontrol.log
+tests/twisted/tools/tmp-session-bus.conf
+/tests/twisted/tools/*.service
+/tests/twisted/tmp-*/
+/tests/twisted/with-session-bus-*.address
+/tests/twisted/with-session-bus-*.pid
/util/mc-account-convert
/util/mc-tool
/util/mc-wait-for-name
/util/mc-wait-for-name.1
-test/twisted/config.py
+tests/twisted/config.py
diff --git a/Makefile.am b/Makefile.am
index 9d17cbd..27bde66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = \
src \
server \
util \
- test \
+ tests \
doc
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 3cecf7d..c09e0d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,9 +371,9 @@ mission-control-plugins/Makefile \
plugins/Makefile \
server/Makefile \
src/Makefile \
-test/Makefile \
-test/twisted/Makefile \
-test/twisted/tools/Makefile \
+tests/Makefile \
+tests/twisted/Makefile \
+tests/twisted/tools/Makefile \
tools/Makefile \
util/Makefile \
xml/Makefile \
diff --git a/test/twisted/tools/Client.AbiWord.service.in b/test/twisted/tools/Client.AbiWord.service.in
deleted file mode 100644
index 418bc38..0000000
--- a/test/twisted/tools/Client.AbiWord.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.AbiWord
-Exec=/bin/sh @abs_top_srcdir@/test/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
diff --git a/test/twisted/tools/Client.Logger.service.in b/test/twisted/tools/Client.Logger.service.in
deleted file mode 100644
index 32f2208..0000000
--- a/test/twisted/tools/Client.Logger.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.Logger
-Exec=/bin/sh @abs_top_srcdir@/test/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
diff --git a/test/Makefile.am b/tests/Makefile.am
index 7f6c399..7f6c399 100644
--- a/test/Makefile.am
+++ b/tests/Makefile.am
diff --git a/test/account-store-default.c b/tests/account-store-default.c
index 464aa98..464aa98 100644
--- a/test/account-store-default.c
+++ b/tests/account-store-default.c
diff --git a/test/account-store-default.h b/tests/account-store-default.h
index 739f95c..739f95c 100644
--- a/test/account-store-default.h
+++ b/tests/account-store-default.h
diff --git a/test/account-store-libaccounts.c b/tests/account-store-libaccounts.c
index 11c2400..11c2400 100644
--- a/test/account-store-libaccounts.c
+++ b/tests/account-store-libaccounts.c
diff --git a/test/account-store-libaccounts.h b/tests/account-store-libaccounts.h
index cb2352b..cb2352b 100644
--- a/test/account-store-libaccounts.h
+++ b/tests/account-store-libaccounts.h
diff --git a/test/account-store.c b/tests/account-store.c
index 5483527..5483527 100644
--- a/test/account-store.c
+++ b/tests/account-store.c
diff --git a/test/keyring-command.c b/tests/keyring-command.c
index 640f448..640f448 100644
--- a/test/keyring-command.c
+++ b/tests/keyring-command.c
diff --git a/test/twisted/Makefile.am b/tests/twisted/Makefile.am
index 1b9a330..fd2d610 100644
--- a/test/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -151,19 +151,19 @@ TESTS =
TMPSUFFIX = foo
BASIC_TESTS_ENVIRONMENT = \
- PYTHONPATH=@abs_top_srcdir@/test/twisted:@abs_top_builddir@/test/twisted \
+ PYTHONPATH=@abs_top_srcdir@/tests/twisted:@abs_top_builddir@/tests/twisted \
MC_DEBUG=all \
- MC_FILTER_PLUGIN_DIR=@abs_top_builddir@/test/twisted/.libs \
- MC_CHANDLERS_DIR=@abs_top_srcdir@/test/twisted/chandlers \
- MC_ACCOUNT_DIR=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- XDG_CONFIG_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- XDG_CONFIG_DIRS=@abs_top_srcdir@/test/twisted \
- XDG_DATA_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- XDG_DATA_DIRS=@abs_top_srcdir@/test/twisted \
- XDG_CACHE_DIR=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- XDG_CACHE_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- MC_CLIENTS_DIR=@abs_top_srcdir@/test/twisted/telepathy/clients \
- MC_MANAGER_DIR=@abs_top_srcdir@/test/twisted/telepathy/managers \
+ MC_FILTER_PLUGIN_DIR=@abs_top_builddir@/tests/twisted/.libs \
+ MC_CHANDLERS_DIR=@abs_top_srcdir@/tests/twisted/chandlers \
+ MC_ACCOUNT_DIR=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ XDG_CONFIG_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ XDG_CONFIG_DIRS=@abs_top_srcdir@/tests/twisted \
+ XDG_DATA_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ XDG_DATA_DIRS=@abs_top_srcdir@/tests/twisted \
+ XDG_CACHE_DIR=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ XDG_CACHE_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ MC_CLIENTS_DIR=@abs_top_srcdir@/tests/twisted/telepathy/clients \
+ MC_MANAGER_DIR=@abs_top_srcdir@/tests/twisted/telepathy/managers \
G_DEBUG=fatal_criticals
if ENABLE_GNOME_KEYRING
@@ -172,8 +172,8 @@ endif
if ENABLE_LIBACCOUNTS_SSO
BASIC_TESTS_ENVIRONMENT += AG_DEBUG=all \
- ACCOUNTS=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \
- AG_SERVICES=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX)
+ ACCOUNTS=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
+ AG_SERVICES=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX)
endif
WITH_SESSION_BUS = \
diff --git a/test/twisted/README b/tests/twisted/README
index 40be6da..56f664a 100644
--- a/test/twisted/README
+++ b/tests/twisted/README
@@ -1,16 +1,16 @@
To run Twisted tests:
- make -C test/twisted check-twisted
+ make -C tests/twisted check-twisted
To run an individual Twisted test:
- make -C test/twisted check-twisted \
+ make -C tests/twisted check-twisted \
TWISTED_BASIC_TESTS= \
TWISTED_SEPARATE_TESTS=dispatcher/create-at-startup.py
To run with debug information:
- make -C test/twisted check-twisted \
+ make -C tests/twisted check-twisted \
TWISTED_BASIC_TESTS= \
TWISTED_SEPARATE_TESTS=dispatcher/create-at-startup.py \
CHECK_TWISTED_VERBOSE=1
diff --git a/test/twisted/account-manager/account-basics.py b/tests/twisted/account-manager/account-basics.py
index 51328ce..51328ce 100644
--- a/test/twisted/account-manager/account-basics.py
+++ b/tests/twisted/account-manager/account-basics.py
diff --git a/test/twisted/account-manager/auto-away.py b/tests/twisted/account-manager/auto-away.py
index 6d2fc81..6d2fc81 100644
--- a/test/twisted/account-manager/auto-away.py
+++ b/tests/twisted/account-manager/auto-away.py
diff --git a/test/twisted/account-manager/auto-connect.py b/tests/twisted/account-manager/auto-connect.py
index badcf7f..badcf7f 100644
--- a/test/twisted/account-manager/auto-connect.py
+++ b/tests/twisted/account-manager/auto-connect.py
diff --git a/test/twisted/account-manager/avatar-persist.py b/tests/twisted/account-manager/avatar-persist.py
index e133443..e133443 100644
--- a/test/twisted/account-manager/avatar-persist.py
+++ b/tests/twisted/account-manager/avatar-persist.py
diff --git a/test/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index 7cc2d2c..7cc2d2c 100644
--- a/test/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
diff --git a/test/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py
index c616e14..c616e14 100644
--- a/test/twisted/account-manager/avatar.py
+++ b/tests/twisted/account-manager/avatar.py
diff --git a/test/twisted/account-manager/bad-cm.py b/tests/twisted/account-manager/bad-cm.py
index dea5860..dea5860 100644
--- a/test/twisted/account-manager/bad-cm.py
+++ b/tests/twisted/account-manager/bad-cm.py
diff --git a/test/twisted/account-manager/create-auto-connect.py b/tests/twisted/account-manager/create-auto-connect.py
index fa2cb47..fa2cb47 100644
--- a/test/twisted/account-manager/create-auto-connect.py
+++ b/tests/twisted/account-manager/create-auto-connect.py
diff --git a/test/twisted/account-manager/create-twice.py b/tests/twisted/account-manager/create-twice.py
index 2f0c0e0..2f0c0e0 100644
--- a/test/twisted/account-manager/create-twice.py
+++ b/tests/twisted/account-manager/create-twice.py
diff --git a/test/twisted/account-manager/create-with-properties.py b/tests/twisted/account-manager/create-with-properties.py
index 5aabfc7..5aabfc7 100644
--- a/test/twisted/account-manager/create-with-properties.py
+++ b/tests/twisted/account-manager/create-with-properties.py
diff --git a/test/twisted/account-manager/device-idle.py b/tests/twisted/account-manager/device-idle.py
index 089a066..089a066 100644
--- a/test/twisted/account-manager/device-idle.py
+++ b/tests/twisted/account-manager/device-idle.py
diff --git a/test/twisted/account-manager/enable-auto-connect.py b/tests/twisted/account-manager/enable-auto-connect.py
index 2cb91c3..2cb91c3 100644
--- a/test/twisted/account-manager/enable-auto-connect.py
+++ b/tests/twisted/account-manager/enable-auto-connect.py
diff --git a/test/twisted/account-manager/enable.py b/tests/twisted/account-manager/enable.py
index 50e489d..50e489d 100644
--- a/test/twisted/account-manager/enable.py
+++ b/tests/twisted/account-manager/enable.py
diff --git a/test/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py
index 17d5804..17d5804 100644
--- a/test/twisted/account-manager/make-valid.py
+++ b/tests/twisted/account-manager/make-valid.py
diff --git a/test/twisted/account-manager/nickname.py b/tests/twisted/account-manager/nickname.py
index 8e2fe79..8e2fe79 100644
--- a/test/twisted/account-manager/nickname.py
+++ b/tests/twisted/account-manager/nickname.py
diff --git a/test/twisted/account-manager/param-types.py b/tests/twisted/account-manager/param-types.py
index 8dafd7f..8dafd7f 100644
--- a/test/twisted/account-manager/param-types.py
+++ b/tests/twisted/account-manager/param-types.py
diff --git a/test/twisted/account-manager/presence.py b/tests/twisted/account-manager/presence.py
index abef3b0..abef3b0 100755
--- a/test/twisted/account-manager/presence.py
+++ b/tests/twisted/account-manager/presence.py
diff --git a/test/twisted/account-manager/reconnect.py b/tests/twisted/account-manager/reconnect.py
index 0c6ea3a..0c6ea3a 100644
--- a/test/twisted/account-manager/reconnect.py
+++ b/tests/twisted/account-manager/reconnect.py
diff --git a/test/twisted/account-manager/recover-from-disconnect.py b/tests/twisted/account-manager/recover-from-disconnect.py
index aba6059..aba6059 100644
--- a/test/twisted/account-manager/recover-from-disconnect.py
+++ b/tests/twisted/account-manager/recover-from-disconnect.py
diff --git a/test/twisted/account-manager/request-online.py b/tests/twisted/account-manager/request-online.py
index 83f34f4..83f34f4 100644
--- a/test/twisted/account-manager/request-online.py
+++ b/tests/twisted/account-manager/request-online.py
diff --git a/test/twisted/account-manager/server-drops-us.py b/tests/twisted/account-manager/server-drops-us.py
index b4db423..b4db423 100644
--- a/test/twisted/account-manager/server-drops-us.py
+++ b/tests/twisted/account-manager/server-drops-us.py
diff --git a/test/twisted/account-manager/service.py b/tests/twisted/account-manager/service.py
index f7df990..f7df990 100644
--- a/test/twisted/account-manager/service.py
+++ b/tests/twisted/account-manager/service.py
diff --git a/test/twisted/account-manager/update-parameters.py b/tests/twisted/account-manager/update-parameters.py
index 347a313..347a313 100644
--- a/test/twisted/account-manager/update-parameters.py
+++ b/tests/twisted/account-manager/update-parameters.py
diff --git a/test/twisted/account-requests/cancel.py b/tests/twisted/account-requests/cancel.py
index d5776ae..d5776ae 100644
--- a/test/twisted/account-requests/cancel.py
+++ b/tests/twisted/account-requests/cancel.py
diff --git a/test/twisted/account-requests/create-text.py b/tests/twisted/account-requests/create-text.py
index 6488f99..6488f99 100644
--- a/test/twisted/account-requests/create-text.py
+++ b/tests/twisted/account-requests/create-text.py
diff --git a/test/twisted/account-requests/delete-account-during-request.py b/tests/twisted/account-requests/delete-account-during-request.py
index dd24fe4..dd24fe4 100644
--- a/test/twisted/account-requests/delete-account-during-request.py
+++ b/tests/twisted/account-requests/delete-account-during-request.py
diff --git a/test/twisted/account-storage/default-keyring-storage.py b/tests/twisted/account-storage/default-keyring-storage.py
index 5d066d6..5d066d6 100644
--- a/test/twisted/account-storage/default-keyring-storage.py
+++ b/tests/twisted/account-storage/default-keyring-storage.py
diff --git a/test/twisted/account-storage/diverted-storage.py b/tests/twisted/account-storage/diverted-storage.py
index 46b66b1..46b66b1 100644
--- a/test/twisted/account-storage/diverted-storage.py
+++ b/tests/twisted/account-storage/diverted-storage.py
diff --git a/test/twisted/account-storage/libaccounts-sso-storage.py b/tests/twisted/account-storage/libaccounts-sso-storage.py
index c6b68b6..c6b68b6 100644
--- a/test/twisted/account-storage/libaccounts-sso-storage.py
+++ b/tests/twisted/account-storage/libaccounts-sso-storage.py
diff --git a/test/twisted/account/addressing.py b/tests/twisted/account/addressing.py
index 84faae9..84faae9 100755
--- a/test/twisted/account/addressing.py
+++ b/tests/twisted/account/addressing.py
diff --git a/test/twisted/accounts/README b/tests/twisted/accounts/README
index 27bd48f..27bd48f 100644
--- a/test/twisted/accounts/README
+++ b/tests/twisted/accounts/README
diff --git a/test/twisted/capabilities/contact-caps.py b/tests/twisted/capabilities/contact-caps.py
index 7a348df..7a348df 100644
--- a/test/twisted/capabilities/contact-caps.py
+++ b/tests/twisted/capabilities/contact-caps.py
diff --git a/test/twisted/capabilities/draft-1.py b/tests/twisted/capabilities/draft-1.py
index 4924e74..4924e74 100644
--- a/test/twisted/capabilities/draft-1.py
+++ b/tests/twisted/capabilities/draft-1.py
diff --git a/test/twisted/capabilities/legacy-caps.py b/tests/twisted/capabilities/legacy-caps.py
index 81d99ab..81d99ab 100644
--- a/test/twisted/capabilities/legacy-caps.py
+++ b/tests/twisted/capabilities/legacy-caps.py
diff --git a/test/twisted/chandlers/README b/tests/twisted/chandlers/README
index 2980ceb..2980ceb 100644
--- a/test/twisted/chandlers/README
+++ b/tests/twisted/chandlers/README
diff --git a/test/twisted/constants.py b/tests/twisted/constants.py
index dbedd44..dbedd44 100644
--- a/test/twisted/constants.py
+++ b/tests/twisted/constants.py
diff --git a/test/twisted/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py
index da63294..da63294 100644
--- a/test/twisted/crash-recovery/crash-recovery.py
+++ b/tests/twisted/crash-recovery/crash-recovery.py
diff --git a/test/twisted/dispatcher/already-has-channel.py b/tests/twisted/dispatcher/already-has-channel.py
index e744425..e744425 100644
--- a/test/twisted/dispatcher/already-has-channel.py
+++ b/tests/twisted/dispatcher/already-has-channel.py
diff --git a/test/twisted/dispatcher/already-has-obsolete.py b/tests/twisted/dispatcher/already-has-obsolete.py
index 05dcb11..05dcb11 100644
--- a/test/twisted/dispatcher/already-has-obsolete.py
+++ b/tests/twisted/dispatcher/already-has-obsolete.py
diff --git a/test/twisted/dispatcher/approver-fails.py b/tests/twisted/dispatcher/approver-fails.py
index 67ce36a..67ce36a 100644
--- a/test/twisted/dispatcher/approver-fails.py
+++ b/tests/twisted/dispatcher/approver-fails.py
diff --git a/test/twisted/dispatcher/bypass-approval.py b/tests/twisted/dispatcher/bypass-approval.py
index 0655a9a..0655a9a 100644
--- a/test/twisted/dispatcher/bypass-approval.py
+++ b/tests/twisted/dispatcher/bypass-approval.py
diff --git a/test/twisted/dispatcher/bypass-observers.py b/tests/twisted/dispatcher/bypass-observers.py
index d8b0266..d8b0266 100644
--- a/test/twisted/dispatcher/bypass-observers.py
+++ b/tests/twisted/dispatcher/bypass-observers.py
diff --git a/test/twisted/dispatcher/cancel.py b/tests/twisted/dispatcher/cancel.py
index f47a297..f47a297 100644
--- a/test/twisted/dispatcher/cancel.py
+++ b/tests/twisted/dispatcher/cancel.py
diff --git a/test/twisted/dispatcher/capture-bundle.py b/tests/twisted/dispatcher/capture-bundle.py
index de77384..de77384 100644
--- a/test/twisted/dispatcher/capture-bundle.py
+++ b/tests/twisted/dispatcher/capture-bundle.py
diff --git a/test/twisted/dispatcher/connect-for-request.py b/tests/twisted/dispatcher/connect-for-request.py
index 5cbb975..5cbb975 100644
--- a/test/twisted/dispatcher/connect-for-request.py
+++ b/tests/twisted/dispatcher/connect-for-request.py
diff --git a/test/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py
index ceec48b..ceec48b 100644
--- a/test/twisted/dispatcher/create-at-startup.py
+++ b/tests/twisted/dispatcher/create-at-startup.py
diff --git a/test/twisted/dispatcher/create-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py
index b99e29f..b99e29f 100644
--- a/test/twisted/dispatcher/create-delayed-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/create-delayed-by-plugin.py b/tests/twisted/dispatcher/create-delayed-by-plugin.py
index 8a37d22..8a37d22 100644
--- a/test/twisted/dispatcher/create-delayed-by-plugin.py
+++ b/tests/twisted/dispatcher/create-delayed-by-plugin.py
diff --git a/test/twisted/dispatcher/create-handler-fails.py b/tests/twisted/dispatcher/create-handler-fails.py
index c5ab096..c5ab096 100644
--- a/test/twisted/dispatcher/create-handler-fails.py
+++ b/tests/twisted/dispatcher/create-handler-fails.py
diff --git a/test/twisted/dispatcher/create-hints.py b/tests/twisted/dispatcher/create-hints.py
index 9894276..9894276 100644
--- a/test/twisted/dispatcher/create-hints.py
+++ b/tests/twisted/dispatcher/create-hints.py
diff --git a/test/twisted/dispatcher/create-no-preferred-handler.py b/tests/twisted/dispatcher/create-no-preferred-handler.py
index 15579b0..15579b0 100644
--- a/test/twisted/dispatcher/create-no-preferred-handler.py
+++ b/tests/twisted/dispatcher/create-no-preferred-handler.py
diff --git a/test/twisted/dispatcher/create-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py
index 2f51758..2f51758 100644
--- a/test/twisted/dispatcher/create-rejected-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/create-text.py b/tests/twisted/dispatcher/create-text.py
index 0a05f9d..0a05f9d 100644
--- a/test/twisted/dispatcher/create-text.py
+++ b/tests/twisted/dispatcher/create-text.py
diff --git a/test/twisted/dispatcher/created-behind-our-back.py b/tests/twisted/dispatcher/created-behind-our-back.py
index 55d1b4b..55d1b4b 100644
--- a/test/twisted/dispatcher/created-behind-our-back.py
+++ b/tests/twisted/dispatcher/created-behind-our-back.py
diff --git a/test/twisted/dispatcher/dispatch-activatable.py b/tests/twisted/dispatcher/dispatch-activatable.py
index cb7b9cb..cb7b9cb 100644
--- a/test/twisted/dispatcher/dispatch-activatable.py
+++ b/tests/twisted/dispatcher/dispatch-activatable.py
diff --git a/test/twisted/dispatcher/dispatch-before-connected.py b/tests/twisted/dispatcher/dispatch-before-connected.py
index 9925e0f..9925e0f 100644
--- a/test/twisted/dispatcher/dispatch-before-connected.py
+++ b/tests/twisted/dispatcher/dispatch-before-connected.py
diff --git a/test/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
index 50bc803..50bc803 100644
--- a/test/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-delayed-by-plugin.py b/tests/twisted/dispatcher/dispatch-delayed-by-plugin.py
index 24a4709..24a4709 100644
--- a/test/twisted/dispatcher/dispatch-delayed-by-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-delayed-by-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-obsolete.py b/tests/twisted/dispatcher/dispatch-obsolete.py
index 4431631..4431631 100644
--- a/test/twisted/dispatcher/dispatch-obsolete.py
+++ b/tests/twisted/dispatcher/dispatch-obsolete.py
diff --git a/test/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
index eeb6e9e..eeb6e9e 100644
--- a/test/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-rejected-by-plugin.py b/tests/twisted/dispatcher/dispatch-rejected-by-plugin.py
index 272eac3..272eac3 100644
--- a/test/twisted/dispatcher/dispatch-rejected-by-plugin.py
+++ b/tests/twisted/dispatcher/dispatch-rejected-by-plugin.py
diff --git a/test/twisted/dispatcher/dispatch-text.py b/tests/twisted/dispatcher/dispatch-text.py
index b1f6ce6..b1f6ce6 100644
--- a/test/twisted/dispatcher/dispatch-text.py
+++ b/tests/twisted/dispatcher/dispatch-text.py
diff --git a/test/twisted/dispatcher/ensure-and-redispatch.py b/tests/twisted/dispatcher/ensure-and-redispatch.py
index 42e60c5..42e60c5 100644
--- a/test/twisted/dispatcher/ensure-and-redispatch.py
+++ b/tests/twisted/dispatcher/ensure-and-redispatch.py
diff --git a/test/twisted/dispatcher/ensure-is-approval.py b/tests/twisted/dispatcher/ensure-is-approval.py
index a2fb085..a2fb085 100644
--- a/test/twisted/dispatcher/ensure-is-approval.py
+++ b/tests/twisted/dispatcher/ensure-is-approval.py
diff --git a/test/twisted/dispatcher/ensure-rapidly.py b/tests/twisted/dispatcher/ensure-rapidly.py
index 17be46a..17be46a 100644
--- a/test/twisted/dispatcher/ensure-rapidly.py
+++ b/tests/twisted/dispatcher/ensure-rapidly.py
diff --git a/test/twisted/dispatcher/exploding-bundles.py b/tests/twisted/dispatcher/exploding-bundles.py
index a62a700..a62a700 100644
--- a/test/twisted/dispatcher/exploding-bundles.py
+++ b/tests/twisted/dispatcher/exploding-bundles.py
diff --git a/test/twisted/dispatcher/fdo-21034.py b/tests/twisted/dispatcher/fdo-21034.py
index 4766631..4766631 100644
--- a/test/twisted/dispatcher/fdo-21034.py
+++ b/tests/twisted/dispatcher/fdo-21034.py
diff --git a/test/twisted/dispatcher/handle-channels-fails.py b/tests/twisted/dispatcher/handle-channels-fails.py
index 04b51ef..04b51ef 100644
--- a/test/twisted/dispatcher/handle-channels-fails.py
+++ b/tests/twisted/dispatcher/handle-channels-fails.py
diff --git a/test/twisted/dispatcher/lose-text.py b/tests/twisted/dispatcher/lose-text.py
index d652658..d652658 100644
--- a/test/twisted/dispatcher/lose-text.py
+++ b/tests/twisted/dispatcher/lose-text.py
diff --git a/test/twisted/dispatcher/recover-from-disconnect.py b/tests/twisted/dispatcher/recover-from-disconnect.py
index 9ae81e5..9ae81e5 100644
--- a/test/twisted/dispatcher/recover-from-disconnect.py
+++ b/tests/twisted/dispatcher/recover-from-disconnect.py
diff --git a/test/twisted/dispatcher/request-disabled-account.py b/tests/twisted/dispatcher/request-disabled-account.py
index 325961d..325961d 100644
--- a/test/twisted/dispatcher/request-disabled-account.py
+++ b/tests/twisted/dispatcher/request-disabled-account.py
diff --git a/test/twisted/dispatcher/respawn-activatable-observers.py b/tests/twisted/dispatcher/respawn-activatable-observers.py
index 8f83ffb..8f83ffb 100644
--- a/test/twisted/dispatcher/respawn-activatable-observers.py
+++ b/tests/twisted/dispatcher/respawn-activatable-observers.py
diff --git a/test/twisted/dispatcher/respawn-observers.py b/tests/twisted/dispatcher/respawn-observers.py
index 73847be..73847be 100644
--- a/test/twisted/dispatcher/respawn-observers.py
+++ b/tests/twisted/dispatcher/respawn-observers.py
diff --git a/test/twisted/dispatcher/undispatchable.py b/tests/twisted/dispatcher/undispatchable.py
index 35b5f44..35b5f44 100644
--- a/test/twisted/dispatcher/undispatchable.py
+++ b/tests/twisted/dispatcher/undispatchable.py
diff --git a/test/twisted/dispatcher/vanishing-client.py b/tests/twisted/dispatcher/vanishing-client.py
index 92a4079..92a4079 100644
--- a/test/twisted/dispatcher/vanishing-client.py
+++ b/tests/twisted/dispatcher/vanishing-client.py
diff --git a/test/twisted/fakeclient.py b/tests/twisted/fakeclient.py
index d3c4381..d3c4381 100644
--- a/test/twisted/fakeclient.py
+++ b/tests/twisted/fakeclient.py
diff --git a/test/twisted/fakecm.py b/tests/twisted/fakecm.py
index fb534e7..fb534e7 100644
--- a/test/twisted/fakecm.py
+++ b/tests/twisted/fakecm.py
diff --git a/test/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c
index 3bcbc4d..3bcbc4d 100644
--- a/test/twisted/mc-debug-server.c
+++ b/tests/twisted/mc-debug-server.c
diff --git a/test/twisted/mcp-account-diversion.c b/tests/twisted/mcp-account-diversion.c
index 0994e25..0994e25 100644
--- a/test/twisted/mcp-account-diversion.c
+++ b/tests/twisted/mcp-account-diversion.c
diff --git a/test/twisted/mcp-dbus-caller-permission.c b/tests/twisted/mcp-dbus-caller-permission.c
index 96162ba..96162ba 100644
--- a/test/twisted/mcp-dbus-caller-permission.c
+++ b/tests/twisted/mcp-dbus-caller-permission.c
diff --git a/test/twisted/mcp-plugin.c b/tests/twisted/mcp-plugin.c
index 53aa173..53aa173 100644
--- a/test/twisted/mcp-plugin.c
+++ b/tests/twisted/mcp-plugin.c
diff --git a/test/twisted/mctest.py b/tests/twisted/mctest.py
index e67b8cd..e67b8cd 100644
--- a/test/twisted/mctest.py
+++ b/tests/twisted/mctest.py
diff --git a/test/twisted/servicetest.py b/tests/twisted/servicetest.py
index 700c05a..700c05a 100644
--- a/test/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
diff --git a/test/twisted/telepathy/clients/AbiWord.client b/tests/twisted/telepathy/clients/AbiWord.client
index 2ec8494..2ec8494 100644
--- a/test/twisted/telepathy/clients/AbiWord.client
+++ b/tests/twisted/telepathy/clients/AbiWord.client
diff --git a/test/twisted/telepathy/clients/Logger.client b/tests/twisted/telepathy/clients/Logger.client
index b46d0d5..b46d0d5 100644
--- a/test/twisted/telepathy/clients/Logger.client
+++ b/tests/twisted/telepathy/clients/Logger.client
diff --git a/test/twisted/telepathy/clients/README b/tests/twisted/telepathy/clients/README
index 7b725bf..7b725bf 100644
--- a/test/twisted/telepathy/clients/README
+++ b/tests/twisted/telepathy/clients/README
diff --git a/test/twisted/telepathy/managers/README b/tests/twisted/telepathy/managers/README
index d77437c..d77437c 100644
--- a/test/twisted/telepathy/managers/README
+++ b/tests/twisted/telepathy/managers/README
diff --git a/test/twisted/telepathy/managers/fakecm.manager b/tests/twisted/telepathy/managers/fakecm.manager
index 23a074e..23a074e 100644
--- a/test/twisted/telepathy/managers/fakecm.manager
+++ b/tests/twisted/telepathy/managers/fakecm.manager
diff --git a/test/twisted/telepathy/managers/onewitheverything.manager b/tests/twisted/telepathy/managers/onewitheverything.manager
index 222dadd..222dadd 100644
--- a/test/twisted/telepathy/managers/onewitheverything.manager
+++ b/tests/twisted/telepathy/managers/onewitheverything.manager
diff --git a/test/twisted/test-plugin.c b/tests/twisted/test-plugin.c
index 89171a3..89171a3 100644
--- a/test/twisted/test-plugin.c
+++ b/tests/twisted/test-plugin.c
diff --git a/tests/twisted/tools/Client.AbiWord.service.in b/tests/twisted/tools/Client.AbiWord.service.in
new file mode 100644
index 0000000..300bd5b
--- /dev/null
+++ b/tests/twisted/tools/Client.AbiWord.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.AbiWord
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.AbiWord
diff --git a/tests/twisted/tools/Client.Logger.service.in b/tests/twisted/tools/Client.Logger.service.in
new file mode 100644
index 0000000..9fd4bfb
--- /dev/null
+++ b/tests/twisted/tools/Client.Logger.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.Logger
+Exec=/bin/sh @abs_top_srcdir@/tests/twisted/tools/fake-startup.sh org.freedesktop.Telepathy.Client.Logger
diff --git a/test/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 57ba504..57ba504 100644
--- a/test/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
diff --git a/test/twisted/tools/MissionControl5.service.in b/tests/twisted/tools/MissionControl5.service.in
index 8967b3e..e8f41c4 100644
--- a/test/twisted/tools/MissionControl5.service.in
+++ b/tests/twisted/tools/MissionControl5.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.MissionControl5
-Exec=@abs_top_builddir@/test/twisted/tools/exec-with-log.sh
+Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/test/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index 73f3a3d..0b40a24 100644
--- a/test/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA
-cd "@abs_top_builddir@/test/twisted/tools"
+cd "@abs_top_builddir@/tests/twisted/tools"
ulimit -c unlimited
exec > missioncontrol-$$.log 2>&1
@@ -37,7 +37,7 @@ if test -n "$MISSIONCONTROL_TEST_VALGRIND"; then
MISSIONCONTROL_WRAPPER="valgrind --leak-check=full --num-callers=20"
MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --track-origins=yes"
MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER -v"
- MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --suppressions=@abs_top_srcdir@/test/twisted/tools/valgrind.supp"
+ MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --suppressions=@abs_top_srcdir@/tests/twisted/tools/valgrind.supp"
MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --gen-suppressions=all"
MISSIONCONTROL_WRAPPER="$MISSIONCONTROL_WRAPPER --show-reachable=yes"
elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
@@ -51,7 +51,7 @@ elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then
fi
if test "z$MC_EXECUTABLE" = z; then
- MC_EXECUTABLE=@abs_top_builddir@/test/twisted/mc-debug-server
+ MC_EXECUTABLE=@abs_top_builddir@/tests/twisted/mc-debug-server
fi
if test -f "$MC_ACCOUNT_DIR/gnome-keyring-env"; then
diff --git a/test/twisted/tools/fake-startup.sh b/tests/twisted/tools/fake-startup.sh
index d571c01..d571c01 100644
--- a/test/twisted/tools/fake-startup.sh
+++ b/tests/twisted/tools/fake-startup.sh
diff --git a/test/twisted/tools/tmp-session-bus.conf.in b/tests/twisted/tools/tmp-session-bus.conf.in
index 0fca377..84d8d65 100644
--- a/test/twisted/tools/tmp-session-bus.conf.in
+++ b/tests/twisted/tools/tmp-session-bus.conf.in
@@ -10,7 +10,7 @@
<listen>unix:tmpdir=/tmp</listen>
- <servicedir>@abs_top_builddir@/test/twisted/tools</servicedir>
+ <servicedir>@abs_top_builddir@/tests/twisted/tools</servicedir>
<policy context="default">
<!-- Allow everything to be sent -->
diff --git a/test/twisted/tools/valgrind.supp b/tests/twisted/tools/valgrind.supp
index 1a87dd3..1a87dd3 100644
--- a/test/twisted/tools/valgrind.supp
+++ b/tests/twisted/tools/valgrind.supp
diff --git a/test/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh
index 987b9cd..987b9cd 100644
--- a/test/twisted/tools/with-session-bus.sh
+++ b/tests/twisted/tools/with-session-bus.sh
diff --git a/test/value-is-same.c b/tests/value-is-same.c
index 0b64032..0b64032 100644
--- a/test/value-is-same.c
+++ b/tests/value-is-same.c