Refactored check_network_connection() outside the AboutFile class

Author: tdruez

about_code_tool/about.py

@@ -386,6 +386,21 @@ def resource_name(resource_path):
         return ''
 
 
+def check_network_connection():
+    """
+    Returns True if an HTTP connection to the live internet is possible.
+    """
+    http_connection = httplib.HTTPConnection('dejacode.org', timeout=10)
+    try:
+        http_connection.connect()
+    except socket.error:
+        return False
+    else:
+        return True
+
+has_network_connectivity = check_network_connection()
+
+
 class AboutFile(object):
     """
     Represent an ABOUT file and functions to parse and validate a file.
@@ -778,27 +793,13 @@ def check_url(self, url, network_check=False):
             return False
 
         if network_check:
-            # FIXME: we should only check network connection ONCE per run
-            # and cache the results, not do this here
-            if self.check_network_connection():
+            if has_network_connectivity:
                 # FIXME: HEAD request DO NOT WORK for ftp://
                 return self.check_url_reachable(netloc, path)
             else:
                 print('No network connection detected.')
         return url_has_valid_format
 
-    @staticmethod
-    def check_network_connection():
-        """
-        Returns True if an HTTP connection to the live internet is possible.
-        """
-        try:
-            http_connection = httplib.HTTPConnection('dejacode.org')
-            http_connection.connect()
-            return True
-        except socket.error:
-            return False
-
     @staticmethod
     def check_url_reachable(host, path):
         # FIXME: we are only checking netloc and path ... NOT the whole url

about_code_tool/tests/test_about.py

@@ -321,7 +321,7 @@ def test_check_url__with_network__not_starting_with_www(self):
         about_file = about.AboutFile()
         self.assertTrue(about_file.check_url("https://nexb.com", True))
         self.assertTrue(about_file.check_url("http://archive.apache.org/dist/httpcomponents/commons-httpclient/2.0/source/commons-httpclient-2.0-alpha2-src.tar.gz", True))
-        if about_file.check_network_connection():
+        if about.check_network_connection():
             self.assertFalse(about_file.check_url("http://nothing_here.com", True))
 
     def FAILING_test_check_url__with_network__not_starting_with_www_and_spaces(self):
@@ -337,7 +337,7 @@ def test_check_url__with_network__no_schemes(self):
 
     def test_check_url__with_network__not_reachable(self):
         about_file = about.AboutFile()
-        if about_file.check_network_connection():
+        if about.check_network_connection():
             self.assertFalse(about_file.check_url("http://www.google", True))
 
     def test_check_url__with_network__empty_URL(self):