[Telepathy-commits] [telepathy-salut/master] return True when we want to exit the test earlier

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Nov 24 09:37:15 PST 2008


---
 tests/twisted/avahi/test-receive-file-decline.py   |    7 ++-----
 .../avahi/test-send-file-and-cancel-immediately.py |    7 ++-----
 .../twisted/avahi/test-send-file-and-disconnect.py |   10 ++--------
 tests/twisted/avahi/test-send-file-declined.py     |   10 ++--------
 .../twisted/avahi/test-send-file-item-not-found.py |    4 ++--
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/tests/twisted/avahi/test-receive-file-decline.py b/tests/twisted/avahi/test-receive-file-decline.py
index a943b9f..cfd6dd4 100644
--- a/tests/twisted/avahi/test-receive-file-decline.py
+++ b/tests/twisted/avahi/test-receive-file-decline.py
@@ -35,11 +35,8 @@ class ReceiveFileDeclineTest(ReceiveFileTest):
         assert reason == FT_STATE_CHANGE_REASON_LOCAL_STOPPED
         self.q.expect('dbus-signal', signal='Closed')
 
-    def receive_file(self):
-        pass
-
-    def close_channel(self):
-        pass
+        # stop test
+        return True
 
 if __name__ == '__main__':
     test = ReceiveFileDeclineTest()
diff --git a/tests/twisted/avahi/test-send-file-and-cancel-immediately.py b/tests/twisted/avahi/test-send-file-and-cancel-immediately.py
index 2150248..7c63d50 100644
--- a/tests/twisted/avahi/test-send-file-and-cancel-immediately.py
+++ b/tests/twisted/avahi/test-send-file-and-cancel-immediately.py
@@ -32,11 +32,8 @@ class SendFileAndCancelImmediatelyTest(SendFileTest):
         else:
             assert False
 
-    def send_file(self):
-        pass
-
-    def close_channel(self):
-        pass
+        # stop test
+        return True
 
 if __name__ == '__main__':
     test = SendFileAndCancelImmediatelyTest()
diff --git a/tests/twisted/avahi/test-send-file-and-disconnect.py b/tests/twisted/avahi/test-send-file-and-disconnect.py
index 1408dee..5090da5 100644
--- a/tests/twisted/avahi/test-send-file-and-disconnect.py
+++ b/tests/twisted/avahi/test-send-file-and-disconnect.py
@@ -9,14 +9,8 @@ class SendFileAndDisconnectTest(SendFileTest):
         self.conn.Disconnect()
         self.q.expect('dbus-signal', signal='StatusChanged', args=[2L, 1L])
 
-    def client_request_file(self):
-        pass
-
-    def send_file(self):
-        pass
-
-    def close_channel(self):
-        pass
+        # stop test
+        return True
 
 if __name__ == '__main__':
     test = SendFileAndDisconnectTest()
diff --git a/tests/twisted/avahi/test-send-file-declined.py b/tests/twisted/avahi/test-send-file-declined.py
index c9114a2..3322163 100644
--- a/tests/twisted/avahi/test-send-file-declined.py
+++ b/tests/twisted/avahi/test-send-file-declined.py
@@ -33,14 +33,8 @@ class SendFileDeclinedTest(SendFileTest):
         # no byte has been transferred as the file was declined
         assert transferred == 0
 
-    def provide_file(self):
-        pass
-
-    def client_request_file(self):
-        pass
-
-    def send_file(self):
-        pass
+        # stop test
+        return True
 
 if __name__ == '__main__':
     test = SendFileDeclinedTest()
diff --git a/tests/twisted/avahi/test-send-file-item-not-found.py b/tests/twisted/avahi/test-send-file-item-not-found.py
index 991ff88..bcf8cbd 100644
--- a/tests/twisted/avahi/test-send-file-item-not-found.py
+++ b/tests/twisted/avahi/test-send-file-item-not-found.py
@@ -31,8 +31,8 @@ class SendFileItemNotFound(SendFileTest):
         # no byte has been transferred as the transfer failed
         assert transferred == 0
 
-    def send_file(self):
-        pass
+        # stop test
+        return True
 
 if __name__ == '__main__':
     test = SendFileItemNotFound()
-- 
1.5.6.5




More information about the Telepathy-commits mailing list