telepathy-salut: Don' t skip the send-file-ipv6 test if Python is new enough to have the bugfix

[Simon McVittie]

Module: telepathy-salut
Branch: master
Commit: e1a45589d47215dd818adad6e68cd484e7da079b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=e1a45589d47215dd818adad6e68cd484e7da079b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Jan  4 13:01:36 2013 +0000

Don't skip the send-file-ipv6 test if Python is new enough to have the bugfix

---

 .../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 a64fc68..bcd4947 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):