summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/qtip_server_test.py15
-rw-r--r--tests/spawn_vm_test.py3
2 files changed, 7 insertions, 11 deletions
diff --git a/tests/qtip_server_test.py b/tests/qtip_server_test.py
index 511d209a..2f9eebf1 100644
--- a/tests/qtip_server_test.py
+++ b/tests/qtip_server_test.py
@@ -33,7 +33,7 @@ class TestClass:
'installer_ip': '10.20.0.2',
'pod_name': 'default',
'suite_name': 'compute',
- 'max-minutes': 60,
+ 'max_minutes': 60,
'type': 'BM',
'state': 'finished',
'state_detail': [{'state': 'finished', 'benchmark': 'dhrystone_bm.yaml'},
@@ -45,22 +45,19 @@ class TestClass:
({'installer_type': 'fuel',
'installer_ip': '10.20.0.2',
'pod_name': 'zte-pod1',
- 'max-minutes': 20,
+ 'max_minutes': 20,
'suite_name': 'compute',
- 'type': 'VM'},
+ 'type': 'VM',
+ 'benchmark_name': 'dhrystone_vm.yaml'},
{'job_id': '',
'installer_type': 'fuel',
'installer_ip': '10.20.0.2',
'pod_name': 'zte-pod1',
'suite_name': 'compute',
- 'max-minutes': 20,
+ 'max_minutes': 20,
'type': 'VM',
'state': 'finished',
- 'state_detail': [{u'state': u'finished', u'benchmark': u'dhrystone_vm.yaml'},
- {u'state': u'finished', u'benchmark': u'whetstone_vm.yaml'},
- {u'state': u'finished', u'benchmark': u'ramspeed_vm.yaml'},
- {u'state': u'finished', u'benchmark': u'dpi_vm.yaml'},
- {u'state': u'finished', u'benchmark': u'ssl_vm.yaml'}],
+ 'state_detail': [{u'state': u'finished', u'benchmark': u'dhrystone_vm.yaml'}],
'result': 0})
])
@mock.patch('restful_server.qtip_server.args_handler.prepare_and_run_benchmark')
diff --git a/tests/spawn_vm_test.py b/tests/spawn_vm_test.py
index b22745d7..0ec5c902 100644
--- a/tests/spawn_vm_test.py
+++ b/tests/spawn_vm_test.py
@@ -43,13 +43,12 @@ class TestClass:
[('172.10.0.154', '')]),
])
@mock.patch('func.spawn_vm.Env_setup')
- @mock.patch('func.spawn_vm.FetchImg')
@mock.patch('func.spawn_vm.create_zones')
@mock.patch('func.spawn_vm.client', autospec=True)
@mock.patch('func.spawn_vm.keystoneclient.v2_0', autospec=True)
@mock.patch('func.spawn_vm.heatclient.client', autospec=True)
def test_create_zones_success(self, mock_heat, mock_keystone,
- mock_nova_client, mock_zone, mock_fetch,
+ mock_nova_client, mock_zone,
mock_setup, test_input, expected):
mock_nova_client.Client.return_value = Mock()
mock_heat.Client.return_value = Mock(stacks=HeatMock())