From 8d2d52b192a151e27ba0b3cc6e2c407134604454 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Fri, 22 Sep 2017 14:31:23 +0800 Subject: [PATCH] rename functions --- ate/locustfile_template | 3 +-- ate/locusts.py | 6 +++--- ate/testcase.py | 16 ++++++++-------- ate/utils.py | 2 +- tests/test_context.py | 2 +- tests/test_runner.py | 34 +++++++++++++++++----------------- tests/test_task.py | 6 +++--- tests/test_utils.py | 6 +++--- 8 files changed, 37 insertions(+), 38 deletions(-) diff --git a/ate/locustfile_template b/ate/locustfile_template index 235c21a7..3a3bcd1c 100644 --- a/ate/locustfile_template +++ b/ate/locustfile_template @@ -22,5 +22,4 @@ class WebPageUser(HttpLocust): min_wait = 1000 max_wait = 5000 - testsets = testcase.load_testcases_by_path("$TESTCASE_FILE") - testset = testsets[0] + testset = testcase.load_test_file("$TESTCASE_FILE") diff --git a/ate/locusts.py b/ate/locusts.py index 7bc5a129..1f808d2f 100644 --- a/ate/locusts.py +++ b/ate/locusts.py @@ -3,7 +3,7 @@ import multiprocessing import os import sys -from ate.testcase import load_testcases_by_path +from ate.testcase import load_test_file from locust.main import main @@ -36,8 +36,8 @@ def gen_locustfile(testcase_file_path): os.path.dirname(os.path.realpath(__file__)), 'locustfile_template' ) - testsets = load_testcases_by_path(testcase_file_path) - host = testsets[0].get("config", {}).get("request", {}).get("base_url", "") + testset = load_test_file(testcase_file_path) + host = testset.get("config", {}).get("request", {}).get("base_url", "") with codecs.open(template_path, encoding='utf-8') as template: with codecs.open(locustfile_path, 'w', encoding='utf-8') as locustfile: diff --git a/ate/testcase.py b/ate/testcase.py index 97aa6c23..ea7b5a62 100644 --- a/ate/testcase.py +++ b/ate/testcase.py @@ -117,8 +117,11 @@ def load_testcases_by_path(path): return load_testcases_by_path(files_list) elif os.path.isfile(path): - return load_test_file(path) - + testset = load_test_file(path) + if testset["testcases"] or testset["api"]: + return [testset] + else: + return [] else: return [] @@ -141,9 +144,9 @@ def load_test_file(file_path): "api": {}, "testcases": [] } - testcases_list = utils.load_testcases(file_path) + tests_list = utils.load_tests(file_path) - for item in testcases_list: + for item in tests_list: for key in item: if key == "config": testset["config"].update(item["config"]) @@ -170,10 +173,7 @@ def load_test_file(file_path): api_info.update(item["api"]) testset["api"][func_name] = api_info - if testset["testcases"] or testset["api"]: - return [testset] - else: - return [] + return testset def load_testcases_by_call(test_block_dict, call_type): call_func = test_block_dict[call_type] diff --git a/ate/utils.py b/ate/utils.py index c27e4f4d..9a82b068 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -49,7 +49,7 @@ def load_json_file(json_file): with codecs.open(json_file, encoding='utf-8') as data_file: return json.load(data_file) -def load_testcases(testcase_file_path): +def load_tests(testcase_file_path): file_suffix = os.path.splitext(testcase_file_path)[1] if file_suffix == '.json': return load_json_file(testcase_file_path) diff --git a/tests/test_context.py b/tests/test_context.py index ef276be4..a1fc774f 100644 --- a/tests/test_context.py +++ b/tests/test_context.py @@ -12,7 +12,7 @@ class VariableBindsUnittest(unittest.TestCase): def setUp(self): self.context = Context() testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo_binds.yml') - self.testcases = utils.load_testcases(testcase_file_path) + self.testcases = utils.load_tests(testcase_file_path) def test_context_init_functions(self): self.assertIn("get_timestamp", self.context.testset_functions_config) diff --git a/tests/test_runner.py b/tests/test_runner.py index 185e43f2..97da810b 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -1,8 +1,8 @@ import os import requests -from ate import exception, runner, utils -from ate.testcase import load_testcases_by_path +from ate import exception, runner, testcase, utils + from tests.base import ApiServerUnittest @@ -26,7 +26,7 @@ class TestRunner(ApiServerUnittest): def test_run_single_testcase(self): for testcase_file_path in self.testcase_file_path_list: - testcases = utils.load_testcases(testcase_file_path) + testcases = utils.load_tests(testcase_file_path) testcase = testcases[0]["test"] self.assertTrue(self.test_runner.run_test(testcase)) @@ -67,66 +67,66 @@ class TestRunner(ApiServerUnittest): def test_run_testset_hardcode(self): for testcase_file_path in self.testcase_file_path_list: - testsets = load_testcases_by_path(testcase_file_path) - result = self.test_runner.run_testset(testsets[0]) + testset = testcase.load_test_file(testcase_file_path) + result = self.test_runner.run_testset(testset) self.assertTrue(result["success"]) def test_run_testsets_hardcode(self): for testcase_file_path in self.testcase_file_path_list: - testsets = load_testcases_by_path(testcase_file_path) + testsets = testcase.load_testcases_by_path(testcase_file_path) result = self.test_runner.run_testsets(testsets) self.assertTrue(result) def test_run_testset_template_variables(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_variables.yml') - testsets = load_testcases_by_path(testcase_file_path) - result = self.test_runner.run_testset(testsets[0]) + testset = testcase.load_test_file(testcase_file_path) + result = self.test_runner.run_testset(testset) self.assertTrue(result["success"]) def test_run_testset_template_import_functions(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_template_import_functions.yml') - testsets = load_testcases_by_path(testcase_file_path) - result = self.test_runner.run_testset(testsets[0]) + testset = testcase.load_test_file(testcase_file_path) + result = self.test_runner.run_testset(testset) self.assertTrue(result["success"]) def test_run_testsets_template_import_functions(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_template_import_functions.yml') - testsets = load_testcases_by_path(testcase_file_path) + testsets = testcase.load_testcases_by_path(testcase_file_path) result = self.test_runner.run_testsets(testsets) self.assertTrue(result) def test_run_testsets_template_lambda_functions(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_template_lambda_functions.yml') - testsets = load_testcases_by_path(testcase_file_path) + testsets = testcase.load_testcases_by_path(testcase_file_path) result = self.test_runner.run_testsets(testsets) self.assertTrue(result) def test_run_testset_layered(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_layer.yml') - testsets = load_testcases_by_path(testcase_file_path) + testsets = testcase.load_testcases_by_path(testcase_file_path) result = self.test_runner.run_testsets(testsets) self.assertTrue(result) def test_run_testset_output(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_layer.yml') - testsets = load_testcases_by_path(testcase_file_path) - result = self.test_runner.run_testset(testsets[0]) + testset = testcase.load_test_file(testcase_file_path) + result = self.test_runner.run_testset(testset) self.assertTrue(result["success"]) self.assertIn("token", result["output"]) def test_run_testset_with_variables_mapping(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_layer.yml') - testsets = load_testcases_by_path(testcase_file_path) + testset = testcase.load_test_file(testcase_file_path) variables_mapping = { "app_version": '2.9.7' } - result = self.test_runner.run_testset(testsets[0], variables_mapping) + result = self.test_runner.run_testset(testset, variables_mapping) self.assertTrue(result["success"]) self.assertIn("token", result["output"]) diff --git a/tests/test_task.py b/tests/test_task.py index c30a01d2..61fe7f9e 100644 --- a/tests/test_task.py +++ b/tests/test_task.py @@ -1,7 +1,7 @@ import os from ate import task -from ate.testcase import load_testcases_by_path +from ate.testcase import load_test_file from tests.base import ApiServerUnittest @@ -17,8 +17,8 @@ class TestTask(ApiServerUnittest): def test_create_suite(self): testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo_testset_variables.yml') - testsets = load_testcases_by_path(testcase_file_path) - suite = task.ApiTestSuite(testsets[0]) + testset = load_test_file(testcase_file_path) + suite = task.ApiTestSuite(testset) self.assertEqual(suite.countTestCases(), 3) for testcase in suite: self.assertIsInstance(testcase, task.ApiTestCase) diff --git a/tests/test_utils.py b/tests/test_utils.py index 221ee09e..9acd913e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -9,12 +9,12 @@ class TestUtils(ApiServerUnittest): def test_load_testcases_bad_filepath(self): testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo') - self.assertEqual(utils.load_testcases(testcase_file_path), []) + self.assertEqual(utils.load_tests(testcase_file_path), []) def test_load_json_testcases(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_hardcode.json') - testcases = utils.load_testcases(testcase_file_path) + testcases = utils.load_tests(testcase_file_path) self.assertEqual(len(testcases), 3) testcase = testcases[0]["test"] self.assertIn('name', testcase) @@ -25,7 +25,7 @@ class TestUtils(ApiServerUnittest): def test_load_yaml_testcases(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testset_hardcode.yml') - testcases = utils.load_testcases(testcase_file_path) + testcases = utils.load_tests(testcase_file_path) self.assertEqual(len(testcases), 3) testcase = testcases[0]["test"] self.assertIn('name', testcase)