[Telepathy-commits] [telepathy-salut/master] rename test-receive-file-and-sender-disconnect.py to test-receive-file-and-sender-disconnect-while-pending.py

[Guillaume Desmottes]

---
 tests/twisted/Makefile.am                          |    2 +-
 ...ive-file-and-sender-disconnect-while-pending.py |   31 ++++++++++++++++++++
 .../test-receive-file-and-sender-disconnect.py     |   31 --------------------
 3 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
 delete mode 100644 tests/twisted/avahi/test-receive-file-and-sender-disconnect.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index d6cd065..ca262e0 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -19,7 +19,7 @@ TWISTED_AVAHI_TESTS = \
 	avahi/test-receive-and-send-file.py \
 	avahi/test-receive-file.py \
 	avahi/test-receive-file-and-disconnect.py \
-	avahi/test-receive-file-and-sender-disconnect.py \
+	avahi/test-receive-file-and-sender-disconnect-while-pending.py \
 	avahi/test-receive-file-and-xmpp-disconnect.py \
 	avahi/test-receive-file-cancelled-immediately.py \
 	avahi/test-receive-file-decline.py \
diff --git a/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py b/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
new file mode 100644
index 0000000..eed632b
--- /dev/null
+++ b/tests/twisted/avahi/test-receive-file-and-sender-disconnect-while-pending.py
@@ -0,0 +1,31 @@
+import dbus
+
+from saluttest import exec_test
+from file_transfer_helper import ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
+    SOCKET_ACCESS_CONTROL_LOCALHOST
+
+class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
+    def accept_file(self):
+        # The sender of the file disconnects
+        self.outbound.transport.loseConnection()
+        self.contact_service.stop()
+
+        self.q.expect('dbus-signal', signal='FileTransferStateChanged')
+
+        # We can't accept the transfer now
+        try:
+            self.ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
+                SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
+        except dbus.DBusException, e:
+            assert e.get_dbus_name() == 'org.freedesktop.Telepathy.Errors.NotAvailable'
+        else:
+            assert False
+
+        self.close_channel()
+
+        # stop the test
+        return True
+
+if __name__ == '__main__':
+    test = ReceiveFileAndSenderDisconnectWhilePendingTest()
+    exec_test(test.test)
diff --git a/tests/twisted/avahi/test-receive-file-and-sender-disconnect.py b/tests/twisted/avahi/test-receive-file-and-sender-disconnect.py
deleted file mode 100644
index a2529a1..0000000
--- a/tests/twisted/avahi/test-receive-file-and-sender-disconnect.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import dbus
-
-from saluttest import exec_test
-from file_transfer_helper import ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
-    SOCKET_ACCESS_CONTROL_LOCALHOST
-
-class ReceiveFileAndSenderDisconnectTest(ReceiveFileTest):
-    def accept_file(self):
-        # The sender of the file disconnects
-        self.outbound.transport.loseConnection()
-        self.contact_service.stop()
-
-        self.q.expect('dbus-signal', signal='FileTransferStateChanged')
-
-        # We can't accept the transfer now
-        try:
-            self.ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
-                SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
-        except dbus.DBusException, e:
-            assert e.get_dbus_name() == 'org.freedesktop.Telepathy.Errors.NotAvailable'
-        else:
-            assert False
-
-        self.close_channel()
-
-        # stop the test
-        return True
-
-if __name__ == '__main__':
-    test = ReceiveFileAndSenderDisconnectTest()
-    exec_test(test.test)
-- 
1.5.6.5