[telepathy-gabble/master] use exec_file_transfer_test in all the FT tests

[Guillaume Desmottes]

---
 .../test-receive-file-and-disconnect.py            |    8 +++-----
 ...ive-file-and-sender-disconnect-while-pending.py |    8 ++------
 tests/twisted/file-transfer/test-receive-file.py   |    9 +++------
 .../test-send-file-provide-immediately.py          |    8 ++------
 .../test-send-file-wait-to-provide.py              |    8 ++------
 5 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/tests/twisted/file-transfer/test-receive-file-and-disconnect.py b/tests/twisted/file-transfer/test-receive-file-and-disconnect.py
index 6b9a477..e575fb2 100644
--- a/tests/twisted/file-transfer/test-receive-file-and-disconnect.py
+++ b/tests/twisted/file-transfer/test-receive-file-and-disconnect.py
@@ -1,7 +1,7 @@
 import socket
 
-from gabbletest import exec_test
-from file_transfer_helper import ReceiveFileTest, BytestreamIBB, BytestreamS5B
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
+    BytestreamIBB, BytestreamS5B
 
 class ReceiveFileAndDisconnectTest(ReceiveFileTest):
     def receive_file(self):
@@ -14,6 +14,4 @@ class ReceiveFileAndDisconnectTest(ReceiveFileTest):
         return True
 
 if __name__ == '__main__':
-    test = ReceiveFileAndDisconnectTest(BytestreamIBB)
-    test = ReceiveFileAndDisconnectTest(BytestreamS5B)
-    exec_test(test.test)
+    exec_file_transfer_test(ReceiveFileAndDisconnectTest)
diff --git a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
index 6ecec6a..50f1963 100644
--- a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
+++ b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
@@ -2,8 +2,7 @@ import dbus
 
 from twisted.words.xish import domish
 
-from gabbletest import exec_test
-from file_transfer_helper import ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
     SOCKET_ACCESS_CONTROL_LOCALHOST, BytestreamIBB, BytestreamS5B,\
     FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_REMOTE_STOPPED
 
@@ -36,7 +35,4 @@ class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
         return True
 
 if __name__ == '__main__':
-    test = ReceiveFileAndSenderDisconnectWhilePendingTest(BytestreamIBB)
-    exec_test(test.test)
-    test = ReceiveFileAndSenderDisconnectWhilePendingTest(BytestreamS5B)
-    exec_test(test.test)
+    exec_file_transfer_test(ReceiveFileAndSenderDisconnectWhilePendingTest)
diff --git a/tests/twisted/file-transfer/test-receive-file.py b/tests/twisted/file-transfer/test-receive-file.py
index b040dac..8b05b04 100644
--- a/tests/twisted/file-transfer/test-receive-file.py
+++ b/tests/twisted/file-transfer/test-receive-file.py
@@ -1,8 +1,5 @@
-from gabbletest import exec_test
-from file_transfer_helper import ReceiveFileTest, BytestreamIBB, BytestreamS5B
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
+        BytestreamIBB, BytestreamS5B
 
 if __name__ == '__main__':
-    test = ReceiveFileTest(BytestreamIBB)
-    exec_test(test.test)
-    test = ReceiveFileTest(BytestreamS5B)
-    exec_test(test.test)
+    exec_file_transfer_test(ReceiveFileTest)
diff --git a/tests/twisted/file-transfer/test-send-file-provide-immediately.py b/tests/twisted/file-transfer/test-send-file-provide-immediately.py
index 725b296..0b437bf 100644
--- a/tests/twisted/file-transfer/test-send-file-provide-immediately.py
+++ b/tests/twisted/file-transfer/test-send-file-provide-immediately.py
@@ -1,6 +1,5 @@
-from gabbletest import exec_test
 from file_transfer_helper import SendFileTest, CHANNEL_TYPE_FILE_TRANSFER, FT_STATE_PENDING, \
-    FT_STATE_CHANGE_REASON_NONE, FT_STATE_OPEN, BytestreamIBB, BytestreamS5B
+    FT_STATE_CHANGE_REASON_NONE, FT_STATE_OPEN, BytestreamIBB, BytestreamS5B, exec_file_transfer_test
 
 class SendFileTransferProvideImmediately(SendFileTest):
     def provide_file(self):
@@ -25,7 +24,4 @@ class SendFileTransferProvideImmediately(SendFileTest):
         assert reason == FT_STATE_CHANGE_REASON_NONE
 
 if __name__ == '__main__':
-    test = SendFileTransferProvideImmediately(BytestreamIBB)
-    exec_test(test.test)
-    test = SendFileTransferProvideImmediately(BytestreamS5B)
-    exec_test(test.test)
+    exec_file_transfer_test(SendFileTransferProvideImmediately)
diff --git a/tests/twisted/file-transfer/test-send-file-wait-to-provide.py b/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
index ec6e3b5..48b87c3 100644
--- a/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
+++ b/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
@@ -1,7 +1,6 @@
-from gabbletest import exec_test
 from file_transfer_helper import SendFileTest, CHANNEL_TYPE_FILE_TRANSFER, \
     FT_STATE_PENDING, FT_STATE_ACCEPTED, FT_STATE_OPEN, FT_STATE_CHANGE_REASON_REQUESTED, \
-    FT_STATE_CHANGE_REASON_NONE, BytestreamIBB, BytestreamS5B
+    FT_STATE_CHANGE_REASON_NONE, BytestreamIBB, BytestreamS5B, exec_file_transfer_test
 
 class SendFileTransferWaitToProvideTest(SendFileTest):
     def __init__(self, bytestream_cls):
@@ -39,7 +38,4 @@ class SendFileTransferWaitToProvideTest(SendFileTest):
         assert reason == FT_STATE_CHANGE_REASON_REQUESTED
 
 if __name__ == '__main__':
-    test = SendFileTransferWaitToProvideTest(BytestreamIBB)
-    exec_test(test.test)
-    test = SendFileTransferWaitToProvideTest(BytestreamS5B)
-    exec_test(test.test)
+    exec_file_transfer_test(SendFileTransferWaitToProvideTest)
-- 
1.5.6.5