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

3 files changed, 23 insertions, 17 deletions

diff --git a/tests/args_handler_test.py b/tests/args_handler_test.py
index 7f977f21..ebf500f3 100644
--- a/tests/args_handler_test.py
+++ b/tests/args_handler_test.py
@@ -13,8 +13,8 @@ import func.args_handler
 
 class TestClass:
     @pytest.mark.parametrize("test_input, expected", [
-        ('./test_cases/zte-pod1/network/iperf_bm.yaml',
-         ["iperf",
+        (['fuel', '/home', './test_cases/zte-pod1/network/iperf_bm.yaml'],
+         ['fuel', '/home', "iperf",
           [('1-server', ['10.20.0.23']), ('2-host', ['10.20.0.24'])],
           "iperf_bm.yaml",
           [('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 10)],
@@ -29,7 +29,7 @@ class TestClass:
                                                   mock_env_setup_ssh, mock_update_ansible, test_input, expected):
         mock_ips = mock.Mock(return_value=["10.20.0.23", "10.20.0.24"])
         func.args_handler.Env_setup.fetch_compute_ips = mock_ips
-        func.args_handler.prepare_and_run_benchmark(test_input)
+        func.args_handler.prepare_and_run_benchmark(test_input[0], test_input[1], test_input[2])
         call = mock_driver.call_args
         call_args, call_kwargs = call
         assert sorted(map(sorted, call_args)) == sorted(map(sorted, expected))
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)
diff --git a/tests/driver_test.py b/tests/driver_test.py
index 9517d26d..71f01b0e 100644
--- a/tests/driver_test.py
+++ b/tests/driver_test.py
@@ -1,20 +1,20 @@
 import pytest
 import mock
-import os
 from func.driver import Driver
 
 
 class TestClass:
     @pytest.mark.parametrize("test_input, expected", [
-        (["iperf",
+        (['fuel',
+          '/home',
+          "iperf",
           [('host', ['10.20.0.13', '10.20.0.15'])],
           "iperf_bm.yaml",
           [('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 0)],
           [("10.20.0.13", [None]), ("10.20.0.15", [None])],
           {'http_proxy': 'http://10.20.0.1:8118',
            'https_proxy': 'http://10.20.0.1:8118',
-           'no_proxy': 'localhost,127.0.0.1,10.20.*,192.168.*'},
-          'fuel'],
+           'no_proxy': 'localhost,127.0.0.1,10.20.*,192.168.*'}],
          [{'Dest_dir': 'results',
            'ip1': '',
            'ip2': '',
@@ -29,13 +29,14 @@ class TestClass:
            'protocol': 'tcp',
            'bandwidthGbps': 0,
            "role": "host"}]),
-        (["iperf",
+        (['joid',
+          '/home',
+          "iperf",
           [('1-server', ['10.20.0.13']), ('2-host', ['10.20.0.15'])],
           "iperf_vm.yaml",
           [('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 0)],
           [("10.20.0.13", [None]), ("10.20.0.15", [None])],
-          {},
-          'joid'],
+          {}],
          [{'Dest_dir': 'results',
            'ip1': '10.20.0.13',
            'ip2': '',
@@ -63,12 +64,10 @@ class TestClass:
     @mock.patch('func.driver.AnsibleApi')
     def test_driver_success(self, mock_ansible, test_input, expected):
         mock_ansible.execute_playbook.return_value = True
-        k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': test_input[6], 'PWD': '/home'})
-        k.start()
         dri = Driver()
-        dri.drive_bench(test_input[0], test_input[1], test_input[2], test_input[3], test_input[4], test_input[5])
+        dri.drive_bench(test_input[0], test_input[1], test_input[2], test_input[3],
+                        test_input[4], test_input[5], test_input[6], test_input[7])
         call_list = mock_ansible.execute_playbook.call_args_list
-        k.stop()
         for call in call_list:
             call_args, call_kwargs = call
             real_call = call_args[3]