X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest_kubernetes%2Ftest_k8stest.py;h=16b0f24607dc1c049a0de6446e14615d1e67ab19;hb=1d7be777356eea7c46fbb34f683e3a896536f358;hp=05f40e12e455cddd3a99d7e77ba66008ac0e3c7d;hpb=f10f754a53aca22dcbe56855976ec50b676f75b2;p=functest-kubernetes.git

diff --git a/functest_kubernetes/test_k8stest.py b/functest_kubernetes/test_k8stest.py
index 05f40e12..16b0f246 100644
--- a/functest_kubernetes/test_k8stest.py
+++ b/functest_kubernetes/test_k8stest.py
@@ -32,31 +32,14 @@ class K8sTests(unittest.TestCase):
 
         self.k8stesting = k8stest.K8sTesting()
 
-    def _test_no_env_var(self, var):
-        del os.environ[var]
-        with self.assertRaises(Exception):
-            k8stest.K8sTesting().check_envs()
-
-    def test_no_deploy_scenario(self):
-        self._test_no_env_var("DEPLOY_SCENARIO")
-
-    def test_no_kube_master_ip(self):
-        self._test_no_env_var("KUBE_MASTER_IP")
-
-    def test_no_kube_master_url(self):
-        self._test_no_env_var("KUBE_MASTER_URL")
-
-    def test_no_kubernetes_provider(self):
-        self._test_no_env_var("KUBERNETES_PROVIDER")
-
     @mock.patch('functest_kubernetes.k8stest.os.path.isfile',
                 return_value=False)
     def test_run_missing_config_file(self, mock_func):
         self.k8stesting.config = 'not_file'
         with mock.patch.object(self.k8stesting,
                                '_K8sTesting__logger') as mock_logger:
-            self.assertEquals(self.k8stesting.run(),
-                              testcase.TestCase.EX_RUN_ERROR)
+            self.assertEqual(self.k8stesting.run(),
+                             testcase.TestCase.EX_RUN_ERROR)
             mock_logger.error.assert_called_with(
                 "Cannot run k8s testcases. Config file not found")
         mock_func.assert_called_with('not_file')
@@ -66,13 +49,15 @@ class K8sTests(unittest.TestCase):
         with self.assertRaises(TypeError):
             self.k8stesting.run_kubetest()
 
+    @mock.patch('re.search')
+    @mock.patch('six.moves.builtins.open', mock.mock_open())
     @mock.patch('functest_kubernetes.k8stest.os.path.isfile')
     @mock.patch('functest_kubernetes.k8stest.subprocess.Popen')
-    def test_run(self, mock_open, mock_isfile):
-        self.assertEquals(self.k8stesting.run(),
-                          testcase.TestCase.EX_OK)
-        mock_isfile.assert_called()
-        mock_open.assert_called()
+    def test_run(self, *args):
+        self.assertEqual(self.k8stesting.run(),
+                         testcase.TestCase.EX_OK)
+        for loop in range(3):
+            args[loop].assert_called()
 
 
 if __name__ == "__main__":