X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Ftests%2Funit%2Fcli%2Ftest_cli_base.py;h=185a52204395e34030ce86a0ace9f533ea0278fa;hb=0424a6d98739ac7499c28799570ea8a625c0779c;hp=61bd093e6154d45c267f1e19b21053fcdbc3b811;hpb=fb3ef61a03cdf2fb938d771e9d23f6435cff240f;p=functest.git

diff --git a/functest/tests/unit/cli/test_cli_base.py b/functest/tests/unit/cli/test_cli_base.py
index 61bd093e6..185a52204 100644
--- a/functest/tests/unit/cli/test_cli_base.py
+++ b/functest/tests/unit/cli/test_cli_base.py
@@ -7,7 +7,10 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+# pylint: disable=missing-docstring
+
 import logging
+import os
 import unittest
 
 import mock
@@ -17,6 +20,7 @@ with mock.patch('functest.cli.commands.cli_testcase.CliTestcase.__init__',
                 mock.Mock(return_value=None)), \
     mock.patch('functest.cli.commands.cli_tier.CliTier.__init__',
                mock.Mock(return_value=None)):
+    os.environ['OS_AUTH_URL'] = ''
     from functest.cli import cli_base
 
 
@@ -24,10 +28,10 @@ class CliBaseTesting(unittest.TestCase):
 
     def setUp(self):
         self.runner = CliRunner()
-        self._openstack = cli_base._openstack
-        self._env = cli_base._env
-        self._testcase = cli_base._testcase
-        self._tier = cli_base._tier
+        self._openstack = cli_base.OPENSTACK
+        self._env = cli_base.ENV
+        self._testcase = cli_base.TESTCASE
+        self._tier = cli_base.TIER
 
     def test_os_check(self):
         with mock.patch.object(self._openstack, 'check') as mock_method:
@@ -35,26 +39,6 @@ class CliBaseTesting(unittest.TestCase):
             self.assertEqual(result.exit_code, 0)
             self.assertTrue(mock_method.called)
 
-    def test_os_snapshot_create(self):
-        with mock.patch.object(self._openstack, 'snapshot_create') \
-                as mock_method:
-            result = self.runner.invoke(cli_base.os_snapshot_create)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_os_snapshot_show(self):
-        with mock.patch.object(self._openstack, 'snapshot_show') \
-                as mock_method:
-            result = self.runner.invoke(cli_base.os_snapshot_show)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_os_clean(self):
-        with mock.patch.object(self._openstack, 'clean') as mock_method:
-            result = self.runner.invoke(cli_base.os_clean)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
     def test_os_show_credentials(self):
         with mock.patch.object(self._openstack, 'show_credentials') \
                 as mock_method:
@@ -62,24 +46,12 @@ class CliBaseTesting(unittest.TestCase):
             self.assertEqual(result.exit_code, 0)
             self.assertTrue(mock_method.called)
 
-    def test_env_prepare(self):
-        with mock.patch.object(self._env, 'prepare') as mock_method:
-            result = self.runner.invoke(cli_base.env_prepare)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
     def test_env_show(self):
         with mock.patch.object(self._env, 'show') as mock_method:
             result = self.runner.invoke(cli_base.env_show)
             self.assertEqual(result.exit_code, 0)
             self.assertTrue(mock_method.called)
 
-    def test_env_status(self):
-        with mock.patch.object(self._env, 'status') as mock_method:
-            result = self.runner.invoke(cli_base.env_status)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
     def test_testcase_list(self):
         with mock.patch.object(self._testcase, 'list') as mock_method:
             result = self.runner.invoke(cli_base.testcase_list)