aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhifeng jiang <jiang.zhifeng@zte.com.cn>2016-10-16 00:37:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-16 00:37:43 +0000
commit2af11e64cc8b1eb321982be9618417724d529a29 (patch)
treed3157c585689a4997ca943eacce4812793084ccd
parent975e241de4d4bf3839c788ad743d0cc077e23bd4 (diff)
parent456fcf8a0b684e787a5af2d743830dbddf3878fc (diff)
Merge "Unit test bugfix: Remove the zte-pod1 in unit test."
-rw-r--r--tests/cli_test.py8
-rw-r--r--tests/qtip_server_test.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/cli_test.py b/tests/cli_test.py
index 12d0abb0..43a11089 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -11,7 +11,7 @@ class TestClass:
'-f',
'compute'], "You have specified a lab that is not present in test_cases"),
(['-l',
- 'zte-pod1',
+ 'default',
'-f',
'test'], "Test File Does not exist in test_list")
])
@@ -26,10 +26,10 @@ class TestClass:
@pytest.mark.parametrize("test_input, expected", [
(['-l',
- 'zte-pod1',
+ 'default',
'-f',
- 'storage'], [('fuel', '/home', './test_cases/zte-pod1/storage/fio_bm.yaml'),
- ('fuel', '/home', './test_cases/zte-pod1/storage/fio_vm.yaml')])
+ 'storage'], [('fuel', '/home', './test_cases/default/storage/fio_bm.yaml'),
+ ('fuel', '/home', './test_cases/default/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):
diff --git a/tests/qtip_server_test.py b/tests/qtip_server_test.py
index 9def21f8..81bb302b 100644
--- a/tests/qtip_server_test.py
+++ b/tests/qtip_server_test.py
@@ -46,7 +46,7 @@ class TestClass:
'result': 0}),
({'installer_type': 'fuel',
'installer_ip': '10.20.0.2',
- 'pod_name': 'zte-pod1',
+ 'pod_name': 'default',
'max_minutes': 20,
'suite_name': 'compute',
'type': 'VM',
@@ -56,7 +56,7 @@ class TestClass:
{'job_id': '',
'installer_type': 'fuel',
'installer_ip': '10.20.0.2',
- 'pod_name': 'zte-pod1',
+ 'pod_name': 'default',
'suite_name': 'compute',
'max_minutes': 20,
'type': 'VM',