Merge "Get auth token when checking deployment"

[functest-xtesting.git] / functest / tests / unit / cli / commands / test_cli_os.py

diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index c3285ec..b827e87 100644 (file)
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -14,7 +14,6 @@ import os
 import mock
 
 from functest.cli.commands import cli_os
-from functest.utils.constants import CONST
 
 
 class CliOpenStackTesting(unittest.TestCase):
@@ -25,7 +24,6 @@ class CliOpenStackTesting(unittest.TestCase):
         self.installer_type = 'test_installer_type'
         self.installer_ip = 'test_installer_ip'
         self.openstack_creds = 'test_openstack_creds'
-        self.dir_repo_functest = 'test_dir_repo_functest'
         self.snapshot_file = 'test_snapshot_file'
         self.cli_os = cli_os.CliOpenStack()
 
@@ -61,90 +59,12 @@ class CliOpenStackTesting(unittest.TestCase):
                                                     self.endpoint_ip)
             mock_exit.assert_called_once_with(0)
 
-    @mock.patch('functest.cli.commands.cli_os.ft_utils.execute_command')
-    def test_check(self, mock_ftutils_execute):
-        with mock.patch.object(self.cli_os, 'ping_endpoint'):
-            CONST.__setattr__('dir_repo_functest', self.dir_repo_functest)
-            cmd = os.path.join(CONST.__getattribute__('dir_repo_functest'),
-                               "functest/ci/check_os.sh")
-            self.cli_os.check()
-            mock_ftutils_execute.assert_called_once_with(cmd, verbose=False)
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=False)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_snapshot_create(self, mock_click_echo, mock_os_path):
+    def test_check(self):
         with mock.patch.object(self.cli_os, 'ping_endpoint'), \
-                mock.patch('functest.cli.commands.cli_os.os_snapshot.main') \
-                as mock_os_snapshot:
-            self.cli_os.snapshot_create()
-            mock_click_echo.assert_called_once_with("Generating Openstack "
-                                                    "snapshot...")
-            self.assertTrue(mock_os_snapshot.called)
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_snapshot_create_overwrite(self, mock_click_echo, mock_os_path):
-        with mock.patch('__builtin__.raw_input', return_value="y") \
-                as mock_raw_input, \
-                mock.patch.object(self.cli_os, 'ping_endpoint'), \
-                mock.patch('functest.cli.commands.cli_os.os_snapshot.main') \
-                as mock_os_snapshot:
-            self.cli_os.snapshot_create()
-            mock_click_echo.assert_called_once_with("Generating Openstack "
-                                                    "snapshot...")
-            mock_raw_input.assert_any_call("It seems there is already an "
-                                           "OpenStack snapshot. Do you want "
-                                           "to overwrite it with the current "
-                                           "OpenStack status? [y|n]\n")
-            self.assertTrue(mock_os_snapshot.called)
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=False)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_snapshot_show_missing_snap(self, mock_click_echo, mock_os_path):
-        self.cli_os.snapshot_show()
-        mock_click_echo.assert_called_once_with("There is no OpenStack "
-                                                "snapshot created. To create "
-                                                "one run the command "
-                                                "'functest openstack "
-                                                "snapshot-create'")
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_snapshot_show_default(self, mock_click_echo, mock_os_path):
-        with mock.patch('__builtin__.open', mock.mock_open(read_data='0')) \
-                as m:
-            self.cli_os.snapshot_file = self.snapshot_file
-            self.cli_os.snapshot_show()
-            m.assert_called_once_with(self.snapshot_file, 'r')
-            mock_click_echo.assert_called_once_with("\n0")
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=True)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_clean(self, mock_click_echo, mock_os_path):
-        with mock.patch.object(self.cli_os, 'ping_endpoint'), \
-                mock.patch('functest.cli.commands.cli_os.os_clean.main') \
-                as mock_os_clean:
-            self.cli_os.clean()
-            self.assertTrue(mock_os_clean.called)
-
-    @mock.patch('functest.cli.commands.cli_os.os.path.isfile',
-                return_value=False)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_clean_missing_file(self, mock_click_echo, mock_os_path):
-        with mock.patch.object(self.cli_os, 'ping_endpoint'):
-            self.cli_os.clean()
-            mock_click_echo.assert_called_once_with("Not possible to clean "
-                                                    "OpenStack without a "
-                                                    "snapshot. This could "
-                                                    "cause problems. "
-                                                    "Run first the command "
-                                                    "'functest openstack "
-                                                    "snapshot-create'")
+            mock.patch('functest.cli.commands.cli_os.check_deployment.'
+                       'CheckDeployment') as mock_check_deployment:
+            self.cli_os.check()
+            self.assertTrue(mock_check_deployment.called)
 
     @mock.patch('functest.cli.commands.cli_os.click.echo')
     def test_show_credentials(self, mock_click_echo):