From ecd8696e6e009826523b62a508cdf2202eaa2411 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 20 Sep 2012 02:29:19 +0900
Subject: tests pass after branding changes

---
 src/leap/base/tests/test_config.py | 62 ++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

(limited to 'src/leap/base/tests/test_config.py')

diff --git a/src/leap/base/tests/test_config.py b/src/leap/base/tests/test_config.py
index 74b06119..bede5ea1 100644
--- a/src/leap/base/tests/test_config.py
+++ b/src/leap/base/tests/test_config.py
@@ -65,15 +65,15 @@ class ProviderTest(BaseLeapTest):
         pass
 
 
-class BareHomeTestCase(ProviderTest):
+# XXX depreacated. similar test in eip.checks
 
-    __name__ = "provider_config_tests_bare_home"
-
-    # XXX review. is it still needed?
-
-    def test_should_raise_if_missing_eip_json(self):
-        with self.assertRaises(exceptions.MissingConfigFileError):
-            config.get_config_json(os.path.join(self.home, 'eip.json'))
+#class BareHomeTestCase(ProviderTest):
+#
+    #__name__ = "provider_config_tests_bare_home"
+#
+    #def test_should_raise_if_missing_eip_json(self):
+        #with self.assertRaises(exceptions.MissingConfigFileError):
+            #config.get_config_json(os.path.join(self.home, 'eip.json'))
 
 
 class ProviderDefinitionTestCase(ProviderTest):
@@ -94,8 +94,10 @@ class ProviderDefinitionTestCase(ProviderTest):
             json.dump(eipconstants.EIP_SAMPLE_JSON, fp)
 
 
-# these tests below should move to wherever
-# we put the fetcher for provider files and related stuff.
+# these tests below should move to
+# eip.checks
+# config.Configuration has been deprecated
+
 # TODO:
 # - We're instantiating a ProviderTest because we're doing the home wipeoff
 # on setUpClass instead of the setUp (for speedup of the general cases).
@@ -112,26 +114,26 @@ class ProviderDefinitionTestCase(ProviderTest):
 # (so we can pass mock easily).
 
 
-class ProviderFetchConError(ProviderTest):
-    def test_connection_error(self):
-        with mock.patch.object(requests, "get") as mock_method:
-            mock_method.side_effect = requests.ConnectionError
-            cf = config.Configuration()
-            self.assertIsInstance(cf.error, str)
-
-
-class ProviderFetchHttpError(ProviderTest):
-    def test_file_not_found(self):
-        with mock.patch.object(requests, "get") as mock_method:
-            mock_method.side_effect = requests.HTTPError
-            cf = config.Configuration()
-            self.assertIsInstance(cf.error, str)
-
-
-class ProviderFetchInvalidUrl(ProviderTest):
-    def test_invalid_url(self):
-        cf = config.Configuration("ht")
-        self.assertTrue(cf.error)
+#class ProviderFetchConError(ProviderTest):
+    #def test_connection_error(self):
+        #with mock.patch.object(requests, "get") as mock_method:
+            #mock_method.side_effect = requests.ConnectionError
+            #cf = config.Configuration()
+            #self.assertIsInstance(cf.error, str)
+#
+#
+#class ProviderFetchHttpError(ProviderTest):
+    #def test_file_not_found(self):
+        #with mock.patch.object(requests, "get") as mock_method:
+            #mock_method.side_effect = requests.HTTPError
+            #cf = config.Configuration()
+            #self.assertIsInstance(cf.error, str)
+#
+#
+#class ProviderFetchInvalidUrl(ProviderTest):
+    #def test_invalid_url(self):
+        #cf = config.Configuration("ht")
+        #self.assertTrue(cf.error)
 
 
 # end provider fetch tests
-- 
cgit v1.2.3