summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/api/test_server.py (renamed from tests/unit/api/qtip_server_test.py)16
-rw-r--r--tests/unit/utils/ansible_api_test.py11
2 files changed, 18 insertions, 9 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])
diff --git a/tests/unit/utils/ansible_api_test.py b/tests/unit/utils/ansible_api_test.py
index 6b1afb44..6f286fc3 100644
--- a/tests/unit/utils/ansible_api_test.py
+++ b/tests/unit/utils/ansible_api_test.py
@@ -6,14 +6,17 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+
+from tests import BaseTest
from qtip.utils.ansible_api import AnsibleApi
-class TestClass:
+class TestClass(BaseTest):
+
def test_call_ansible_api_success(self):
ansible_api = AnsibleApi()
- ret = ansible_api.execute_playbook('tests/data/hosts',
- 'tests/data/test.yml',
- 'config/QtipKey',
+ ret = ansible_api.execute_playbook(self.abspath('hosts'),
+ self.abspath('test.yml'),
+ self.abspath('QtipKey'),
{'keys': 'test'})
assert ret == 3