diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 13:01:36 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 13:01:36 +0000 |
| commit | e1a45589d47215dd818adad6e68cd484e7da079b (patch) | |
| tree | 1df61cac7e713ee20168a30bdc60fb84d75881d7 | |
| parent | b87e2c68401ef9f315f745867b653000276323a0 (diff) | |
| download | telepathy-salut-e1a45589d47215dd818adad6e68cd484e7da079b.tar.gz | |
Don't skip the send-file-ipv6 test if Python is new enough to have the bugfix
| -rw-r--r-- | tests/twisted/avahi/file-transfer/send-file-ipv6.py | 13 |
1 files changed, 10 insertions, 3 deletions
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): |