Merge "Remove os environment in driver.py so that it can be called by restful server"

1 files changed, 10 insertions, 3 deletions

diff --git a/tests/cli_test.py b/tests/cli_test.py
index f9861dee..fe05327d 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -1,5 +1,6 @@
 import pytest
 import mock
+import os
 from func.cli import cli
 
 
@@ -15,8 +16,11 @@ class TestClass:
           'test'], "Test File Does not exist in test_list")
     ])
     def test_cli_error(self, capfd, test_input, expected):
+        k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'})
         with pytest.raises(SystemExit):
+            k.start()
             cli(test_input)
+            k.stop()
         resout, reserr = capfd.readouterr()
         assert expected in resout
 
@@ -24,11 +28,14 @@ class TestClass:
         (['-l',
           'zte-pod1',
           '-f',
-          'storage'], [('./test_cases/zte-pod1/storage/fio_bm.yaml'),
-                       ('./test_cases/zte-pod1/storage/fio_vm.yaml')])
+          'storage'], [('fuel', '/home', './test_cases/zte-pod1/storage/fio_bm.yaml'),
+                       ('fuel', '/home', './test_cases/zte-pod1/storage/fio_vm.yaml')])
     ])
     @mock.patch('func.cli.args_handler.prepare_and_run_benchmark')
     def test_cli_successful(self, mock_args_handler, test_input, expected):
+        k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'})
+        k.start()
         cli(test_input)
-        call_list = map(lambda x: mock_args_handler.call_args_list[x][0][0], range(len(expected)))
+        k.stop()
+        call_list = map(lambda x: mock_args_handler.call_args_list[x][0], range(len(expected)))
         assert sorted(call_list) == sorted(expected)