diff options
author | Olli Salli <olli.salli@collabora.co.uk> | 2012-02-21 20:00:44 +0200 |
---|---|---|
committer | Olli Salli <olli.salli@collabora.co.uk> | 2012-02-21 20:00:44 +0200 |
commit | 2afed9602d88fda812fb3a0d3e4678039cd3862b (patch) | |
tree | efa038f3487b5410697f2f28fb4a85b8e08c0deb /tests | |
parent | 4e94a954362adb866ca270d1299c691f36e20c67 (diff) | |
download | telepathy-salut-2afed9602d88fda812fb3a0d3e4678039cd3862b.tar.gz |
Make receive-file-ipv6 test be reported as SKIP with no IPv6
Diffstat (limited to 'tests')
-rw-r--r-- | tests/twisted/avahi/file-transfer/receive-file-ipv6.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/twisted/avahi/file-transfer/receive-file-ipv6.py b/tests/twisted/avahi/file-transfer/receive-file-ipv6.py index 93d0d1d6..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' @@ -20,10 +25,6 @@ class TestReceiveFileIPv6(ReceiveFileTest): metadata = {} def announce_contact(self, name=CONTACT_NAME): - if not check_ipv6_enabled(): - print "Skipped test as IPv6 doesn't seem to be available" - return True - basic_txt = { "txtvers": "1", "status": "avail" } self.contact_name = '%s@%s' % (name, get_host_name()) |