moved LeapNetworkChecker and test in base.

1 files changed, 0 insertions, 78 deletions

diff --git a/src/leap/eip/tests/test_checks.py b/src/leap/eip/tests/test_checks.py
index f412dbec..06133825 100644
--- a/src/leap/eip/tests/test_checks.py
+++ b/src/leap/eip/tests/test_checks.py
@@ -9,10 +9,8 @@ import os
 import time
 import urlparse
 
-from StringIO import StringIO
 from mock import (patch, Mock)
 
-import ping
 import requests
 
 from leap.base import config as baseconfig
@@ -26,8 +24,6 @@ from leap.testing.basetest import BaseLeapTest
 from leap.testing.https_server import BaseHTTPSServerTestCase
 from leap.testing.https_server import where as where_cert
 
-_uid = os.getuid()
-
 
 class NoLogRequestHandler:
     def log_message(self, *args):
@@ -38,78 +34,6 @@ 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, "check_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.check_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")
-
-    def test_check_internet_connection_failures(self):
-        checker = eipchecks.LeapNetworkChecker()
-        with patch.object(requests, "get") as mocked_get:
-            mocked_get.side_effect = requests.HTTPError
-            with self.assertRaises(eipexceptions.NoInternetConnection):
-                checker.check_internet_connection()
-
-        with patch.object(requests, "get") as mocked_get:
-            mocked_get.side_effect = requests.RequestException
-            with self.assertRaises(eipexceptions.NoInternetConnection):
-                checker.check_internet_connection()
-
-        #TODO: Mock possible errors that can be raised by is_internet_up
-        with patch.object(requests, "get") as mocked_get:
-            mocked_get.side_effect = requests.ConnectionError
-            with self.assertRaises(eipexceptions.NoInternetConnection):
-                checker.check_internet_connection()
-
-    @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"
@@ -149,8 +73,6 @@ class EIPCheckTest(BaseLeapTest):
                         "not called")
         self.assertTrue(mc.check_complete_eip_config.called,
                         "not called")
-        #self.assertTrue(mc.ping_gateway.called,
-                        #"not called")
 
     # test individual check methods