run_testsets: optimize testsets structure

This commit is contained in:
httprunner
2017-06-27 12:11:40 +08:00
parent 0cdd1d9c1e
commit de218878d7
3 changed files with 36 additions and 30 deletions

View File

@@ -78,14 +78,14 @@ class TestRunner(ApiServerUnittest):
def test_run_testcase_suite_json_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])
testsets = utils.load_testcases_by_path(testcase_file_path)
results = self.test_runner.run_testsets(testsets)
self.assertEqual(len(results), 2)
self.assertEqual(results, [(True, {}), (True, {})])
def test_run_testcase_suite_yaml_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.yml')
testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})])
testsets = utils.load_testcases_by_path(testcase_file_path)
results = self.test_runner.run_testsets(testsets)
self.assertEqual(len(results), 2)
self.assertEqual(results, [(True, {}), (True, {})])

View File

@@ -34,16 +34,17 @@ class TestRunnerV2(ApiServerUnittest):
def test_run_testcase_auth_suite_yaml(self):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
testcases = utils.load_testcases(testcase_file_path)
results = self.test_runner.run_testsets(testcases)
testsets = utils.load_testcases_by_path(testcase_file_path)
results = self.test_runner.run_testsets(testsets)
self.assertEqual(len(results), 2)
self.assertEqual(results, [(True, {}), (True, {})])
def test_run_testcase_auth_suite_json(self):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
testcases = utils.load_testcases(testcase_file_path)
results = self.test_runner.run_testsets(testcases)
testsets = utils.load_testcases_by_path(testcase_file_path)
results = self.test_runner.run_testsets(testsets)
self.assertEqual(len(results), 2)
self.assertEqual(results, [(True, {}), (True, {})])
@@ -59,6 +60,7 @@ class TestRunnerV2(ApiServerUnittest):
def test_run_testcase_template_sets_yaml(self):
testcase_file_path = os.path.join(
os.getcwd(), 'test/data/demo_template_sets.yml')
testcases = utils.load_testcases(testcase_file_path)
results = self.test_runner.run_testsets(testcases)
testsets = utils.load_testcases_by_path(testcase_file_path)
results = self.test_runner.run_testsets(testsets)
self.assertEqual(len(results), 2)
self.assertEqual(results, [(True, {}), (True, {})])