1 files changed, 3 insertions, 22 deletions
diff --git a/tests/twisted/avahi/file-transfer/send-file-ipv4.py b/tests/twisted/avahi/file-transfer/send-file-ipv4.py
index d8876500..deec728a 100644
--- a/tests/twisted/avahi/file-transfer/send-file-ipv4.py
+++ b/tests/twisted/avahi/file-transfer/send-file-ipv4.py
@@ -1,37 +1,18 @@
-import avahi
 from saluttest import exec_test
-from avahitest import AvahiAnnouncer, get_host_name
-from xmppstream import setup_stream_listener
 from file_transfer_helper import SendFileTest
-import socket
-
 import constants as cs
 
 class SendFileTransferIPv4(SendFileTest):
-    CONTACT_NAME = 'test-ft'
-
-    def announce_contact(self, name=CONTACT_NAME):
-        basic_txt = { "txtvers": "1", "status": "avail" }
-
-        self.contact_name = '%s@%s' % (name, get_host_name())
-        self.listener, port = setup_stream_listener(self.q, self.contact_name)
-
-        self.contact_service = AvahiAnnouncer(self.contact_name, "_presence._tcp", port,
-                basic_txt, proto=avahi.PROTO_INET)
+    def __init__(self):
+        SendFileTest.__init__(self, cs.SOCKET_ADDRESS_TYPE_IPV4)
 
     def provide_file(self):
-        SendFileTest.provide_file(self, cs.SOCKET_ADDRESS_TYPE_IPV4)
-
-        # state is still Pending as remote didn't accept the transfer yet
+        SendFileTest.provide_file(self)
         state = self.ft_props.Get(cs.CHANNEL_TYPE_FILE_TRANSFER, 'State')
         assert state == cs.FT_STATE_PENDING
 
-    def send_file(self):
-      SendFileTest.send_file(socket.AF_INET);
-
     def client_request_file(self):
         SendFileTest.client_request_file(self)
-
         e = self.q.expect('dbus-signal', signal='InitialOffsetDefined')
         offset = e.args[0]
         # We don't support resume