Merge branch 'Early2000sLinuxUser'

Reviewed-by: Simon McVittie (smcv) <simon.mcvittie@collabora.co.uk>

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/twisted/avahi/file-transfer/receive-file-ipv6.py b/tests/twisted/avahi/file-transfer/receive-file-ipv6.py
index a525db02..e7775f81 100644
--- a/tests/twisted/avahi/file-transfer/receive-file-ipv6.py
+++ b/tests/twisted/avahi/file-transfer/receive-file-ipv6.py
@@ -13,6 +13,11 @@ from xmppstream import connect_to_stream6, setup_stream_listener6
 
 from twisted.words.xish import domish
 
+if not check_ipv6_enabled():
+    print "Skipped test as IPv6 doesn't seem to be available"
+    # exiting 77 causes automake to consider the test to have been skipped
+    raise SystemExit(77)
+
 class TestReceiveFileIPv6(ReceiveFileTest):
     CONTACT_NAME = 'test-ft'
 
@@ -28,10 +33,6 @@ class TestReceiveFileIPv6(ReceiveFileTest):
         self.contact_service = AvahiAnnouncer(self.contact_name, "_presence._tcp", port,
                 basic_txt, proto=avahi.PROTO_INET6)
 
-        if not check_ipv6_enabled():
-            print "Skipped test as IPv6 doesn't seem to be available"
-            return True
-
     def _resolve_salut_presence(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/avahitest.py b/tests/twisted/avahitest.py
index eb68504c..0b9ebaf5 100644
--- a/tests/twisted/avahitest.py
+++ b/tests/twisted/avahitest.py
@@ -190,9 +190,8 @@ class AvahiAnnouncer:
         self.entry.Free()
 
 def check_ipv6_enabled():
-    s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-
     try:
+        s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
         s.bind(('::1', 0))
     except socket.error:
         return False