moved network checks to its own class

so it can be more easily moved to base.checks and reused
when eip is a module.

1 files changed, 55 insertions, 24 deletions

diff --git a/src/leap/eip/tests/test_checks.py b/src/leap/eip/tests/test_checks.py
index caaa371f..bc7db79c 100644
--- a/src/leap/eip/tests/test_checks.py
+++ b/src/leap/eip/tests/test_checks.py
@@ -9,7 +9,7 @@ import os
 import urlparse
 
 from StringIO import StringIO
-from mock import patch, Mock, MagicMock
+from mock import (patch, Mock)
 
 import ping
 import requests
@@ -37,6 +37,60 @@ class NoLogRequestHandler:
         return ''
 
 
+class LeapNetworkCheckTest(BaseLeapTest):
+    # XXX to be moved to base.checks
+
+    __name__ = "leap_network_check_tests"
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_checker_should_implement_check_methods(self):
+        checker = eipchecks.LeapNetworkChecker()
+
+        self.assertTrue(hasattr(checker, "test_internet_connection"),
+                        "missing meth")
+        self.assertTrue(hasattr(checker, "is_internet_up"),
+                        "missing meth")
+        self.assertTrue(hasattr(checker, "ping_gateway"),
+                        "missing meth")
+
+    def test_checker_should_actually_call_all_tests(self):
+        checker = eipchecks.LeapNetworkChecker()
+
+        mc = Mock()
+        checker.run_all(checker=mc)
+        self.assertTrue(mc.test_internet_connection.called, "not called")
+        self.assertTrue(mc.ping_gateway.called, "not called")
+        self.assertTrue(mc.is_internet_up.called,
+                        "not called")
+
+    def test_get_default_interface_no_interface(self):
+        checker = eipchecks.LeapNetworkChecker()
+        with patch('leap.eip.checks.open', create=True) as mock_open:
+            with self.assertRaises(eipexceptions.NoDefaultInterfaceFoundError):
+                mock_open.return_value = StringIO(
+                    "Iface\tDestination Gateway\t"
+                    "Flags\tRefCntd\tUse\tMetric\t"
+                    "Mask\tMTU\tWindow\tIRTT")
+                checker.get_default_interface_gateway()
+
+    def test_ping_gateway_fail(self):
+        checker = eipchecks.LeapNetworkChecker()
+        with patch.object(ping, "quiet_ping") as mocked_ping:
+            with self.assertRaises(eipexceptions.NoConnectionToGateway):
+                mocked_ping.return_value = [11, "", ""]
+                checker.ping_gateway("4.2.2.2")
+
+    @unittest.skipUnless(_uid == 0, "root only")
+    def test_ping_gateway(self):
+        checker = eipchecks.LeapNetworkChecker()
+        checker.ping_gateway("4.2.2.2")
+
+
 class EIPCheckTest(BaseLeapTest):
 
     __name__ = "eip_check_tests"
@@ -61,7 +115,6 @@ class EIPCheckTest(BaseLeapTest):
                         "missing meth")
         self.assertTrue(hasattr(checker, "check_complete_eip_config"),
                         "missing meth")
-        self.assertTrue(hasattr(checker, "ping_gateway"), "missing meth")
 
     def test_checker_should_actually_call_all_tests(self):
         checker = eipchecks.EIPConfigChecker()
@@ -174,28 +227,6 @@ class EIPCheckTest(BaseLeapTest):
         sampleconfig = copy.copy(testdata.EIP_SAMPLE_JSON)
         checker.check_complete_eip_config(config=sampleconfig)
 
-    def test_get_default_interface_no_interface(self):
-        checker = eipchecks.EIPConfigChecker()
-        with patch('leap.eip.checks.open', create=True) as mock_open:
-            with self.assertRaises(eipexceptions.NoDefaultInterfaceFoundError):
-                mock_open.return_value = StringIO(
-                    "Iface\tDestination Gateway\t"
-                    "Flags\tRefCntd\tUse\tMetric\t"
-                    "Mask\tMTU\tWindow\tIRTT")
-                checker.get_default_interface_gateway()
-
-    def test_ping_gateway_fail(self):
-        checker = eipchecks.EIPConfigChecker()
-        with patch.object(ping, "quiet_ping") as mocked_ping:
-            with self.assertRaises(eipexceptions.NoConnectionToGateway):
-                mocked_ping.return_value = [11, "", ""]
-                checker.ping_gateway("4.2.2.2")
-
-    @unittest.skipUnless(_uid == 0, "root only")
-    def test_ping_gateway(self):
-        checker = eipchecks.EIPConfigChecker()
-        checker.ping_gateway("4.2.2.2")
-
 
 class ProviderCertCheckerTest(BaseLeapTest):