7 files changed, 91 insertions, 75 deletions
diff --git a/tests/unit/api/actions/test_test.py b/tests/unit/api/actions/test_test.py
deleted file mode 100644
index 158062ff4..000000000
--- a/tests/unit/api/actions/test_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import unittest
-import json
-
-from api.actions import test
-
-
-class RunTestCase(unittest.TestCase):
-
-    def test_runTestCase_with_no_testcase_arg(self):
-        args = {}
-        output = json.loads(test.runTestCase(args))
-
-        self.assertEqual('error', output['status'])
-
-
-def main():
-    unittest.main()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/api/test_views.py b/tests/unit/api/test_views.py
deleted file mode 100644
index 650ed569c..000000000
--- a/tests/unit/api/test_views.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import unittest
-import mock
-import json
-
-from api.views import Test
-
-
-class TestTestCase(unittest.TestCase):
-
-    @mock.patch('api.views.request')
-    def test_post(self, mock_request):
-        mock_request.json.get.side_effect = ['runTestSuite', {}]
-
-        result = json.loads(Test().post())
-
-        self.assertEqual('error', result['status'])
-
-
-def main():
-    unittest.main()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/api/utils/test_common.py b/tests/unit/api/utils/test_common.py
index 5d858a32c..5d177409e 100644
--- a/tests/unit/api/utils/test_common.py
+++ b/tests/unit/api/utils/test_common.py
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 import unittest
 
 from api.utils import common
diff --git a/tests/unit/api/utils/test_daemonthread.py b/tests/unit/api/utils/test_daemonthread.py
deleted file mode 100644
index 918f1f506..000000000
--- a/tests/unit/api/utils/test_daemonthread.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import unittest
-import mock
-
-from api.utils.daemonthread import DaemonThread
-
-
-class DaemonThreadTestCase(unittest.TestCase):
-
-    @mock.patch('api.utils.daemonthread.os')
-    def test_run(self, mock_os):
-        def func(common_list, task_id):
-            return task_id
-
-        common_list = []
-        task_id = '1234'
-        thread = DaemonThread(func, (common_list, task_id))
-        thread.run()
-
-        mock_os.path.exist.return_value = True
-        pre_path = '../tests/opnfv/test_suites/'
-        mock_os.remove.assert_called_with(pre_path + '1234.yaml')
-
-
-def main():
-    unittest.main()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/unit/api/utils/test_influx.py b/tests/unit/api/utils/test_influx.py
index 5f1e2c36f..0852da2dd 100644
--- a/tests/unit/api/utils/test_influx.py
+++ b/tests/unit/api/utils/test_influx.py
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 import unittest
 import mock
 import uuid
@@ -13,7 +21,7 @@ class GetDataDbClientTestCase(unittest.TestCase):
         mock_parser.ConfigParser().get.return_value = 'file'
         try:
             influx.get_data_db_client()
-        except Exception, e:
+        except Exception as e:
             self.assertIsInstance(e, RuntimeError)
 
 
@@ -54,6 +62,18 @@ class WriteDataTasklistTestCase(unittest.TestCase):
         mock_write_data.assert_called_with('tasklist', field, timestamp, tags)
 
 
+class QueryTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.influx.ConfigParser')
+    def test_query_dispatcher_not_influxdb(self, mock_parser):
+        mock_parser.ConfigParser().get.return_value = 'file'
+        try:
+            sql = 'select * form tasklist'
+            influx.query(sql)
+        except Exception as e:
+            self.assertIsInstance(e, RuntimeError)
+
+
 def main():
     unittest.main()
 
diff --git a/tests/unit/cmd/commands/test_env.py b/tests/unit/cmd/commands/test_env.py
new file mode 100644
index 000000000..af1ab8030
--- /dev/null
+++ b/tests/unit/cmd/commands/test_env.py
@@ -0,0 +1,29 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+import unittest
+import mock
+
+from yardstick.cmd.commands.env import EnvCommand
+
+
+class EnvCommandTestCase(unittest.TestCase):
+
+    @mock.patch('yardstick.cmd.commands.env.HttpClient')
+    def test_do_influxdb(self, mock_http_client):
+        env = EnvCommand()
+        env.do_influxdb({})
+        self.assertTrue(mock_http_client().post.called)
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/common/test_httpClient.py b/tests/unit/common/test_httpClient.py
new file mode 100644
index 000000000..b39dc2332
--- /dev/null
+++ b/tests/unit/common/test_httpClient.py
@@ -0,0 +1,33 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+import unittest
+import mock
+import json
+
+from yardstick.common import httpClient
+
+
+class HttpClientTestCase(unittest.TestCase):
+
+    @mock.patch('yardstick.common.httpClient.requests')
+    def test_post(self, mock_requests):
+        url = 'http://localhost:5000/hello'
+        data = {'hello': 'world'}
+        headers = {'Content-Type': 'application/json'}
+        httpClient.HttpClient().post(url, data)
+        mock_requests.post.assert_called_with(url, data=json.dumps(data),
+                                              headers=headers)
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()