GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 07:26:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

TestRunner: change method name

Browse Source
This commit is contained in:
httprunner
2017-06-26 11:58:07 +08:00
parent 967f2bbc3f
commit 20d173ce9a
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ate/runner.py
+4 -4
View File
@@ -31,7 +31,7 @@ class TestRunner(object):
) )
return parsed_testcase return parsed_testcase
def run_single_testcase(self, testcase): def run_test(self, testcase):
testcase = self.prepare(testcase) testcase = self.prepare(testcase)
req_kwargs = testcase['request'] req_kwargs = testcase['request']
@@ -47,8 +47,8 @@ class TestRunner(object):
success = False if diff_content else True success = False if diff_content else True
return success, diff_content return success, diff_content
def run_testcase_suite(self, testcase_sets): def run_testsets(self, testsets):
return [ return [
self.run_single_testcase(testcase) self.run_test(testcase)
for testcase in testcase_sets for testcase in testsets
] ]
test/test_runner.py
+4 -4
View File
@@ -17,7 +17,7 @@ class TestRunner(ApiServerUnittest):
def test_run_single_testcase_success(self): def test_run_single_testcase_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json') testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0]) success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success) self.assertTrue(success)
def test_run_single_testcase_fail(self): def test_run_single_testcase_fail(self):
@@ -45,7 +45,7 @@ class TestRunner(ApiServerUnittest):
} }
} }
} }
success, diff_content = self.test_runner.run_single_testcase(testcase) success, diff_content = self.test_runner.run_test(testcase)
self.assertFalse(success) self.assertFalse(success)
self.assertEqual( self.assertEqual(
diff_content['status_code'], diff_content['status_code'],
@@ -72,13 +72,13 @@ class TestRunner(ApiServerUnittest):
def test_run_testcase_suite_json_success(self): def test_run_testcase_suite_json_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json') testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.json')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases) result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2) self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})]) self.assertEqual(result, [(True, {}), (True, {})])
def test_run_testcase_suite_yaml_success(self): def test_run_testcase_suite_yaml_success(self):
testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.yml') testcase_file_path = os.path.join(os.getcwd(), 'test/data/simple_demo_no_auth.yml')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases) result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2) self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})]) self.assertEqual(result, [(True, {}), (True, {})])
test/test_runner_v2.py
+6 -6
View File
@@ -20,21 +20,21 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml') os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0]) success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success) self.assertTrue(success)
def test_run_single_testcase_json(self): def test_run_single_testcase_json(self):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.json') os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0]) success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success) self.assertTrue(success)
def test_run_testcase_auth_suite_yaml(self): def test_run_testcase_auth_suite_yaml(self):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml') os.getcwd(), 'test/data/simple_demo_auth_hardcode.yml')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases) result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2) self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})]) self.assertEqual(result, [(True, {}), (True, {})])
@@ -42,7 +42,7 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'test/data/simple_demo_auth_hardcode.json') os.getcwd(), 'test/data/simple_demo_auth_hardcode.json')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
result = self.test_runner.run_testcase_suite(testcases) result = self.test_runner.run_testsets(testcases)
self.assertEqual(len(result), 2) self.assertEqual(len(result), 2)
self.assertEqual(result, [(True, {}), (True, {})]) self.assertEqual(result, [(True, {}), (True, {})])
@@ -50,7 +50,7 @@ class TestRunnerV2(ApiServerUnittest):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'test/data/demo_template_separate.yml') os.getcwd(), 'test/data/demo_template_separate.yml')
testcases = utils.load_testcases(testcase_file_path) testcases = utils.load_testcases(testcase_file_path)
success, _ = self.test_runner.run_single_testcase(testcases[0]) success, _ = self.test_runner.run_test(testcases[0])
self.assertTrue(success) self.assertTrue(success)
success, _ = self.test_runner.run_single_testcase(testcases[1]) success, _ = self.test_runner.run_test(testcases[1])
self.assertFalse(success) self.assertFalse(success)