[Telepathy-commits] [telepathy-salut/master] rename ReceiveFileTransferTest to ReceiveFileTest

[Guillaume Desmottes]

---
 tests/twisted/avahi/file_transfer_helper.py        |    2 +-
 .../test-receive-file-cancelled-immediately.py     |    6 +++---
 tests/twisted/avahi/test-receive-file-decline.py   |    4 ++--
 tests/twisted/avahi/test-receive-file-not-found.py |    4 ++--
 tests/twisted/avahi/test-receive-file.py           |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/twisted/avahi/file_transfer_helper.py b/tests/twisted/avahi/file_transfer_helper.py
index 1c75511..7c9b6db 100644
--- a/tests/twisted/avahi/file_transfer_helper.py
+++ b/tests/twisted/avahi/file_transfer_helper.py
@@ -132,7 +132,7 @@ class FileTransferTest(object):
 
         self.run()
 
-class ReceiveFileTransferTest(FileTransferTest):
+class ReceiveFileTest(FileTransferTest):
     def connect_to_salut(self):
         AvahiListener(self.q).listen_for_service("_presence._tcp")
         e = self.q.expect('service-added', name = self.self_handle_name,
diff --git a/tests/twisted/avahi/test-receive-file-cancelled-immediately.py b/tests/twisted/avahi/test-receive-file-cancelled-immediately.py
index b157f26..243800e 100644
--- a/tests/twisted/avahi/test-receive-file-cancelled-immediately.py
+++ b/tests/twisted/avahi/test-receive-file-cancelled-immediately.py
@@ -1,16 +1,16 @@
 import socket
 
 from saluttest import exec_test
-from file_transfer_helper import ReceiveFileTransferTest, FT_STATE_CANCELLED, \
+from file_transfer_helper import ReceiveFileTest, FT_STATE_CANCELLED, \
     FT_STATE_CHANGE_REASON_REMOTE_STOPPED
 
-class ReceiveFileCancelledImmediatelyTest(ReceiveFileTransferTest):
+class ReceiveFileCancelledImmediatelyTest(ReceiveFileTest):
     def accept_file(self):
         # sender cancels FT immediately so stop to listen to the HTTP socket
         # before we accept the transfer.
         self.httpd.server_close()
 
-        ReceiveFileTransferTest.accept_file(self)
+        ReceiveFileTest.accept_file(self)
 
     def receive_file(self):
         # Connect to Salut's socket
diff --git a/tests/twisted/avahi/test-receive-file-decline.py b/tests/twisted/avahi/test-receive-file-decline.py
index 231e988..a943b9f 100644
--- a/tests/twisted/avahi/test-receive-file-decline.py
+++ b/tests/twisted/avahi/test-receive-file-decline.py
@@ -1,10 +1,10 @@
 from servicetest import make_channel_proxy
 from saluttest import exec_test
 
-from file_transfer_helper import ReceiveFileTransferTest, FT_STATE_CANCELLED, \
+from file_transfer_helper import ReceiveFileTest, FT_STATE_CANCELLED, \
     FT_STATE_CHANGE_REASON_LOCAL_STOPPED
 
-class ReceiveFileDeclineTest(ReceiveFileTransferTest):
+class ReceiveFileDeclineTest(ReceiveFileTest):
     def accept_file(self):
         # decline FT
         self. channel.Close()
diff --git a/tests/twisted/avahi/test-receive-file-not-found.py b/tests/twisted/avahi/test-receive-file-not-found.py
index 140f331..aa8d3c1 100644
--- a/tests/twisted/avahi/test-receive-file-not-found.py
+++ b/tests/twisted/avahi/test-receive-file-not-found.py
@@ -5,10 +5,10 @@ import urllib
 from twisted.words.xish import xpath
 
 from saluttest import exec_test
-from file_transfer_helper import ReceiveFileTransferTest,FT_STATE_CANCELLED, \
+from file_transfer_helper import ReceiveFileTest,FT_STATE_CANCELLED, \
     FT_STATE_CHANGE_REASON_LOCAL_ERROR, CHANNEL_TYPE_FILE_TRANSFER
 
-class ReceiveFileNotFound(ReceiveFileTransferTest):
+class ReceiveFileNotFound(ReceiveFileTest):
     def setup_http_server(self):
         class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             def do_GET(self_):
diff --git a/tests/twisted/avahi/test-receive-file.py b/tests/twisted/avahi/test-receive-file.py
index 4c67cbf..f98c6bf 100644
--- a/tests/twisted/avahi/test-receive-file.py
+++ b/tests/twisted/avahi/test-receive-file.py
@@ -1,6 +1,6 @@
 from saluttest import exec_test
-from file_transfer_helper import ReceiveFileTransferTest
+from file_transfer_helper import ReceiveFileTest
 
 if __name__ == '__main__':
-    test = ReceiveFileTransferTest()
+    test = ReceiveFileTest()
     exec_test(test.test)
-- 
1.5.6.5