From 1558bcf48bdba369187d7cb07482f2fbcc6f4feb Mon Sep 17 00:00:00 2001
From: chenjiankun <chenjiankun1@huawei.com>
Date: Wed, 30 Nov 2016 07:28:36 +0000
Subject: Use flask jsonify method to return json result

JIRA: YARDSTICK-433

Python json lib is very hard to parse when transport via network.
Flask jsonfiy is more easier to use.

Change-Id: I2afd5238d65bc474170c57d2f9307dc881ea4990
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---
 tests/unit/api/utils/test_common.py       | 30 -------------------------
 tests/unit/api/utils/test_daemonthread.py | 37 -------------------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 tests/unit/api/utils/test_daemonthread.py

(limited to 'tests/unit/api/utils')

diff --git a/tests/unit/api/utils/test_common.py b/tests/unit/api/utils/test_common.py
index 9e050c714..5d177409e 100644
--- a/tests/unit/api/utils/test_common.py
+++ b/tests/unit/api/utils/test_common.py
@@ -7,7 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 import unittest
-import json
 
 from api.utils import common
 
@@ -58,35 +57,6 @@ class GetCommandListTestCase(unittest.TestCase):
         self.assertEqual(result_list, output_list)
 
 
-class ErrorHandlerTestCase(unittest.TestCase):
-
-    def test_error_handler(self):
-        message = 'hello world'
-        output_dict = json.loads(common.error_handler(message))
-
-        result = {
-            'status': 'error',
-            'message': message
-        }
-
-        self.assertEqual(result, output_dict)
-
-
-class ResultHandlerTestCase(unittest.TestCase):
-
-    def test_result_handler(self):
-        status = 1
-        data = ['hello world']
-        output_dict = json.loads(common.result_handler(status, data))
-
-        result = {
-            'status': status,
-            'result': data
-        }
-
-        self.assertEqual(result, output_dict)
-
-
 def main():
     unittest.main()
 
diff --git a/tests/unit/api/utils/test_daemonthread.py b/tests/unit/api/utils/test_daemonthread.py
deleted file mode 100644
index f07f0fede..000000000
--- a/tests/unit/api/utils/test_daemonthread.py
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-# 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 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()
-- 
cgit 1.2.3-korg