[telepathy-mission-control/master] Move Account tests into account-manager subdirectory and delete do-nothing.py

[Simon McVittie]

do-nothing.py was just a trivial "hello world" test, to make sure the
infrastructure worked; there's no reason to keep it any more.
---
 test/twisted/Makefile.am                           |    9 +++----
 .../account-basics.py}                             |    0 
 .../bad-cm.py}                                     |    0 
 .../request-online.py}                             |    0 
 test/twisted/do-nothing.py                         |   26 --------------------
 5 files changed, 4 insertions(+), 31 deletions(-)
 rename test/twisted/{test-account.py => account-manager/account-basics.py} (100%)
 rename test/twisted/{account-bad-cm.py => account-manager/bad-cm.py} (100%)
 rename test/twisted/{test-connect.py => account-manager/request-online.py} (100%)
 delete mode 100644 test/twisted/do-nothing.py

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 2e7d2b3..cd22fbb 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -1,7 +1,8 @@
 TWISTED_TESTS =
 
 TWISTED_BASIC_TESTS = \
-	account-bad-cm.py \
+	account-manager/account-basics.py \
+	account-manager/bad-cm.py \
 	account-manager/auto-away.py \
 	account-manager/avatar.py \
 	account-manager/create-auto-connect.py \
@@ -14,6 +15,7 @@ TWISTED_BASIC_TESTS = \
 	account-manager/presence.py \
 	account-manager/reconnect.py \
 	account-manager/recover-from-disconnect.py \
+	account-manager/request-online.py \
 	account-manager/update-parameters.py \
 	account-requests/cancel.py \
 	account-requests/create-text.py \
@@ -39,10 +41,7 @@ TWISTED_BASIC_TESTS = \
 	dispatcher/recover-from-disconnect.py \
 	dispatcher/request-disabled-account.py \
 	dispatcher/undispatchable.py \
-	dispatcher/vanishing-client.py \
-	do-nothing.py \
-	test-account.py \
-	test-connect.py
+	dispatcher/vanishing-client.py
 
 if ENABLE_PLUGINS
 TWISTED_BASIC_TESTS += \
diff --git a/test/twisted/test-account.py b/test/twisted/account-manager/account-basics.py
similarity index 100%
rename from test/twisted/test-account.py
rename to test/twisted/account-manager/account-basics.py
diff --git a/test/twisted/account-bad-cm.py b/test/twisted/account-manager/bad-cm.py
similarity index 100%
rename from test/twisted/account-bad-cm.py
rename to test/twisted/account-manager/bad-cm.py
diff --git a/test/twisted/test-connect.py b/test/twisted/account-manager/request-online.py
similarity index 100%
rename from test/twisted/test-connect.py
rename to test/twisted/account-manager/request-online.py
diff --git a/test/twisted/do-nothing.py b/test/twisted/do-nothing.py
deleted file mode 100644
index 043409f..0000000
--- a/test/twisted/do-nothing.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2009 Nokia Corporation
-# Copyright (C) 2009 Collabora Ltd.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-from mctest import exec_test
-
-def test(q, bus, mc):
-    pass
-
-
-if __name__ == '__main__':
-    exec_test(test, {})
-- 
1.5.6.5