From e1a45589d47215dd818adad6e68cd484e7da079b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 4 Jan 2013 13:01:36 +0000 Subject: Don't skip the send-file-ipv6 test if Python is new enough to have the bugfix --- tests/twisted/avahi/file-transfer/send-file-ipv6.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/twisted/avahi/file-transfer/send-file-ipv6.py b/tests/twisted/avahi/file-transfer/send-file-ipv6.py index a64fc68b..bcd49479 100644 --- a/tests/twisted/avahi/file-transfer/send-file-ipv6.py +++ b/tests/twisted/avahi/file-transfer/send-file-ipv6.py @@ -1,10 +1,17 @@ +import sys + from saluttest import exec_test from file_transfer_helper import SendFileTest import constants as cs -print "FIXME: disabled because of a bug in Python's httplib. http://bugs.python.org/issue5111" -# exiting 77 causes automake to consider the test to have been skipped -raise SystemExit(77) +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) + +if sys.version_info < (2, 7, 1): + print "FIXME: disabled because of a bug in Python's httplib. http://bugs.python.org/issue5111" + raise SystemExit(77) class SendFileTransferIPv6(SendFileTest): def __init__(self): -- cgit v1.2.1