summaryrefslogtreecommitdiffstats
path: root/tests/unit/api
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-12-12 17:32:47 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2016-12-13 08:16:15 +0000
commit84666edf145dd3a5bb27f1038b704fe1682f451b (patch)
treee7f6a5abb2c2c6481f85f877072cdb690fddee1c /tests/unit/api
parentbef252222c8f420bc7eae25743d37dcc1745117b (diff)
refactor qtip-server structure
JIRA: QTIP-186 Change-Id: I4ecdcdc2869de0ef717ebf4bd1346e7c428b5b19 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'tests/unit/api')
-rw-r--r--tests/unit/api/test_server.py (renamed from tests/unit/api/qtip_server_test.py)16
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/unit/api/qtip_server_test.py b/tests/unit/api/test_server.py
index 96544c95..e9364d3d 100644
--- a/tests/unit/api/qtip_server_test.py
+++ b/tests/unit/api/test_server.py
@@ -1,9 +1,15 @@
-import qtip.api.qtip_server as server
-import pytest
import json
-import mock
import time
+import mock
+import pytest
+
+import qtip.api.cmd.server as server
+
+
+def setup_module():
+ server.add_routers()
+
@pytest.fixture
def app():
@@ -66,7 +72,7 @@ class TestClass:
'state_detail': [{u'state': u'finished', u'benchmark': u'dhrystone_vm.yaml'}],
'result': 0})
])
- @mock.patch('qtip.api.qtip_server.args_handler.prepare_and_run_benchmark')
+ @mock.patch('qtip.utils.args_handler.prepare_and_run_benchmark')
def test_post_get_delete_job_successful(self, mock_args_handler, app_client, body, expected):
mock_args_handler.return_value = {'result': 0,
'detail': {'host': [(u'10.20.6.14', {'unreachable': 0,
@@ -107,7 +113,7 @@ class TestClass:
['job_id',
'It already has one job running now!'])
])
- @mock.patch('qtip.api.qtip_server.args_handler.prepare_and_run_benchmark',
+ @mock.patch('qtip.utils.args_handler.prepare_and_run_benchmark',
side_effect=[side_effect_sleep(0.5), side_effect_pass])
def test_post_two_jobs_unsuccessful(self, mock_args_hanler, app_client, body, expected):
reply_1 = app_client.post("/api/v1.0/jobs", data=body[0])