diff options
-rw-r--r-- | func/cli.py | 2 | ||||
-rw-r--r-- | qtip.py | 4 | ||||
-rw-r--r-- | tests/args_handler_test.py | 2 | ||||
-rw-r--r-- | tests/cli_test.py | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/func/cli.py b/func/cli.py index 9222da51..d914a2de 100644 --- a/func/cli.py +++ b/func/cli.py @@ -13,7 +13,7 @@ import args_handler import argparse -class cli: +class Cli: @staticmethod def _parse_args(args): @@ -6,13 +6,13 @@ # which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-from func.cli import cli
+from func.cli import Cli
import os
def main():
os.system('./data/file_permission.sh')
- cli()
+ Cli()
# os.system('cd data/ref_results && python compute_suite.py')
# os.system('cd data/ref_results && python storage_suite.py')
# os.system('cd data/ref_results && python network_suite.py')
diff --git a/tests/args_handler_test.py b/tests/args_handler_test.py index ebf500f3..e6500862 100644 --- a/tests/args_handler_test.py +++ b/tests/args_handler_test.py @@ -13,7 +13,7 @@ import func.args_handler class TestClass: @pytest.mark.parametrize("test_input, expected", [ - (['fuel', '/home', './test_cases/zte-pod1/network/iperf_bm.yaml'], + (['fuel', '/home', './test_cases/default/network/iperf_bm.yaml'], ['fuel', '/home', "iperf", [('1-server', ['10.20.0.23']), ('2-host', ['10.20.0.24'])], "iperf_bm.yaml", diff --git a/tests/cli_test.py b/tests/cli_test.py index fe05327d..12d0abb0 100644 --- a/tests/cli_test.py +++ b/tests/cli_test.py @@ -1,7 +1,7 @@ import pytest import mock import os -from func.cli import cli +from func.cli import Cli class TestClass: @@ -19,7 +19,7 @@ class TestClass: k = mock.patch.dict(os.environ, {'INSTALLER_TYPE': 'fuel', 'PWD': '/home'}) with pytest.raises(SystemExit): k.start() - cli(test_input) + Cli(test_input) k.stop() resout, reserr = capfd.readouterr() assert expected in resout @@ -35,7 +35,7 @@ class TestClass: 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) + Cli(test_input) k.stop() call_list = map(lambda x: mock_args_handler.call_args_list[x][0], range(len(expected))) assert sorted(call_list) == sorted(expected) |