Merge branch 'dont-run-docs-tests-without-internet' into develop

cms/tests/docs.py

@@ -9,15 +9,27 @@
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
+import unittest
+import socket
 
 ROOT_DIR = os.path.dirname(cms.__file__)
 DOCS_DIR = os.path.abspath(os.path.join(ROOT_DIR, '..', 'docs'))
 
 
+def has_no_internet():
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(('4.4.4.2', 80))
+    except socket.error: # no internet
+        return  True
+    return False
+
+
 class DocsTestCase(CMSTestCase):
     """
     Test docs building correctly for HTML
     """
+    @unittest.skipIf(has_no_internet(), "No internet")
     def test_html(self):
         nullout = StringIO()
         with TemporaryDirectory() as OUT_DIR: