From ed193cd6b4e37c5020dfb3e721215080226fee8b Mon Sep 17 00:00:00 2001 From: Jonas Obrist Date: Sat, 24 Dec 2011 18:50:05 +0100 Subject: [PATCH 1/2] Skip the documentation building test if there is no internet connectivity --- cms/tests/docs.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cms/tests/docs.py b/cms/tests/docs.py index 2cabe2dc96f..f0ce827e53b 100644 --- a/cms/tests/docs.py +++ b/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: From 6be0eae17151707541ebd0e787e6555205dc6aef Mon Sep 17 00:00:00 2001 From: Jonas Obrist Date: Sat, 24 Dec 2011 20:00:32 +0100 Subject: [PATCH 2/2] skipIf is weird --- cms/tests/docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/tests/docs.py b/cms/tests/docs.py index f0ce827e53b..ca78b00462a 100644 --- a/cms/tests/docs.py +++ b/cms/tests/docs.py @@ -29,7 +29,7 @@ class DocsTestCase(CMSTestCase): """ Test docs building correctly for HTML """ - @unittest.skipIf(has_no_internet, "No internet") + @unittest.skipIf(has_no_internet(), "No internet") def test_html(self): nullout = StringIO() with TemporaryDirectory() as OUT_DIR: