[telepathy-gabble/master] remove useless bytestream import from FT tests

[Guillaume Desmottes]

---
 .../twisted/file-transfer/file_transfer_helper.py  |    4 ++--
 .../test-receive-file-and-disconnect.py            |    3 +--
 ...ive-file-and-sender-disconnect-while-pending.py |    3 +--
 tests/twisted/file-transfer/test-receive-file.py   |    3 +--
 .../test-send-file-provide-immediately.py          |    2 +-
 .../test-send-file-wait-to-provide.py              |    2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 1ca560b..9dcffbb 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -6,7 +6,7 @@ import time
 from servicetest import EventPattern
 from gabbletest import exec_test
 import ns
-from bytestream import create_from_si_offer, BytestreamIBB, BytestreamS5B, BytestreamS5BPidgin, \
+from bytestream import create_from_si_offer, BytestreamIBBMsg, BytestreamS5B, BytestreamS5BPidgin, \
     BytestreamSIFallbackS5CannotConnect, BytestreamSIFallbackS5WrongHash
 
 from twisted.words.xish import domish, xpath
@@ -424,7 +424,7 @@ class SendFileTest(FileTransferTest):
         assert reason == FT_STATE_CHANGE_REASON_NONE
 
 def exec_file_transfer_test(test_cls):
-    for bytestream_cls  in [BytestreamIBB, BytestreamS5B, BytestreamS5BPidgin, BytestreamSIFallbackS5CannotConnect,
+    for bytestream_cls  in [BytestreamIBBMsg, BytestreamS5B, BytestreamS5BPidgin, BytestreamSIFallbackS5CannotConnect,
             BytestreamSIFallbackS5WrongHash]:
         test = test_cls(bytestream_cls)
         exec_test(test.test)
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 e575fb2..a320b35 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,6 @@
 import socket
 
-from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
-    BytestreamIBB, BytestreamS5B
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest
 
 class ReceiveFileAndDisconnectTest(ReceiveFileTest):
     def receive_file(self):
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 50f1963..3b47276 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
@@ -3,8 +3,7 @@ import dbus
 from twisted.words.xish import domish
 
 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
+    SOCKET_ACCESS_CONTROL_LOCALHOST, FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_REMOTE_STOPPED
 
 class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
     def accept_file(self):
diff --git a/tests/twisted/file-transfer/test-receive-file.py b/tests/twisted/file-transfer/test-receive-file.py
index 8b05b04..f5ce4d3 100644
--- a/tests/twisted/file-transfer/test-receive-file.py
+++ b/tests/twisted/file-transfer/test-receive-file.py
@@ -1,5 +1,4 @@
-from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
-        BytestreamIBB, BytestreamS5B
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest
 
 if __name__ == '__main__':
     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 0b437bf..bb66917 100644
--- a/tests/twisted/file-transfer/test-send-file-provide-immediately.py
+++ b/tests/twisted/file-transfer/test-send-file-provide-immediately.py
@@ -1,5 +1,5 @@
 from file_transfer_helper import SendFileTest, CHANNEL_TYPE_FILE_TRANSFER, FT_STATE_PENDING, \
-    FT_STATE_CHANGE_REASON_NONE, FT_STATE_OPEN, BytestreamIBB, BytestreamS5B, exec_file_transfer_test
+    FT_STATE_CHANGE_REASON_NONE, FT_STATE_OPEN, exec_file_transfer_test
 
 class SendFileTransferProvideImmediately(SendFileTest):
     def provide_file(self):
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 48b87c3..3930249 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,6 +1,6 @@
 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, exec_file_transfer_test
+    FT_STATE_CHANGE_REASON_NONE, exec_file_transfer_test
 
 class SendFileTransferWaitToProvideTest(SendFileTest):
     def __init__(self, bytestream_cls):
-- 
1.5.6.5