in progress, to be rebased

core/wsgi/app.py

@@ -17,7 +17,6 @@ def setup_app(pecan_config=None, extra_hooks=None):
 
     app = pecan.make_app(
         pecan_config.app.root,
-        logging=getattr(pecan_config, 'logging', {}),
         debug=getattr(pecan_config.app, 'debug', False),
         force_canonical=getattr(pecan_config.app, 'force_canonical', True),
         hooks=app_hooks

etc/testing_adapter.conf.sample

@@ -1,13 +1,13 @@
 [DEFAULT]
-database_connection=sqlite://
+#database_connection=sqlite://
 
-log_file=
-log_dir=
-log_format=
-log_date_format=
+#log_file=
+#log_dir=
+#log_format=
+#log_date_format=
 
-test_runs_raw=tempest=-A "type == ["sanity", "fuel"]",
+#test_runs_raw=tempest=-A "type == ["sanity", "fuel"]",
 
-test_conf=test.conf
-test_conf_dir=/etc/
-overwrite_test_conf=True
+#test_conf=test.conf
+#test_conf_dir=/etc/
+#overwrite_test_conf=True

tests/test_v1_rest_api.py

@@ -14,7 +14,7 @@ class ApiV1Tests(unittest2.TestCase):
     def test_get_call(self, request_mock):
         info = {'tempest:1': {'passed': 10}}
         request_mock.api.get_info.return_value = info
-        resp = self.app.get('/v1/tempest?test_run_id=1')
+        resp = self.app.get('/v1/tempest/1')
 
         request_mock.api.get_info.assert_called_once_with(
             'tempest', '1')
@@ -47,3 +47,34 @@ class ApiV1Tests(unittest2.TestCase):
         self.assertEqual(json.loads(resp.text),
                          {'message': 'Please provide ID of test run'})
 
+    @patch('core.wsgi.controllers.v1.request')
+    def test_delete_call_kill_success(self, request_mock):
+        request_mock.api.kill.return_value = True
+
+        resp = self.app.delete('/v1/tempest/1')
+
+        request_mock.api.kill.assert_called_once_with('tempest', '1')
+
+        self.assertEqual(resp.status, '200 OK')
+        self.assertEqual(json.loads(resp.text),
+                         {'message': 'Killed test run with ID 1'})
+
+    @patch('core.wsgi.controllers.v1.request')
+    def test_delete_call_kill_failure(self, request_mock):
+        request_mock.api.kill.return_value = False
+
+        resp = self.app.delete('/v1/tempest/1')
+
+        request_mock.api.kill.assert_called_once_with('tempest', '1')
+
+        self.assertEqual(resp.status, '200 OK')
+        self.assertEqual(json.loads(resp.text),
+                         {'message': 'Test run 1 already finished'})
+
+    def test_delete_call_without_id(self):
+        resp = self.app.delete('/v1/tempest', expect_errors=True)
+
+        self.assertEqual(resp.status, '400 Bad Request')
+        self.assertEqual(json.loads(resp.text),
+                         {'message': 'Please provide ID of test run'})
+