GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-11 18:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

initialize TextTestRunner in HttpRunner initialization

Browse Source
This commit is contained in:
debugtalk
2018-09-17 20:34:00 +08:00
parent 3c4f0210f3
commit 7a34fc1950
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
httprunner/api.py
View File

@@ -39,7 +39,8 @@ class HttpRunner(object):
loader.reset_loader() loader.reset_loader()
loader.dot_env_path = kwargs.pop("dot_env_path", None) loader.dot_env_path = kwargs.pop("dot_env_path", None)
self.http_client_session = kwargs.pop("http_client_session", None) self.http_client_session = kwargs.pop("http_client_session", None)
self.kwargs = kwargs kwargs.setdefault("resultclass", report.HtmlTestResult)
self.unittest_runner = unittest.TextTestRunner(**kwargs)
def load_tests(self, path_or_testcases): def load_tests(self, path_or_testcases):
""" load testcases, extend and merge with api/testcase definitions. """ load testcases, extend and merge with api/testcase definitions.
@@ -184,7 +185,7 @@ class HttpRunner(object):
testcases (list): testcases list testcases (list): testcases list
Returns: Returns:
tuple: (unittest.TextTestRunner(), unittest.TestSuite()) tuple: unittest.TestSuite()
""" """
def __add_teststep(test_runner, config, teststep_dict): def __add_teststep(test_runner, config, teststep_dict):
@@ -214,8 +215,6 @@ class HttpRunner(object):
return test return test
self.exception_stage = "initialize unittest Runner() and TestSuite()" self.exception_stage = "initialize unittest Runner() and TestSuite()"
self.kwargs.setdefault("resultclass", report.HtmlTestResult)
unittest_runner = unittest.TextTestRunner(**self.kwargs)
testcases_list = [] testcases_list = []
loader = unittest.TestLoader() loader = unittest.TestLoader()
@@ -241,13 +240,12 @@ class HttpRunner(object):
loaded_testcases.append(loaded_testcase) loaded_testcases.append(loaded_testcase)
test_suite = unittest.TestSuite(loaded_testcases) test_suite = unittest.TestSuite(loaded_testcases)
return (unittest_runner, test_suite) return test_suite
def run_tests(self, unittest_runner, test_suite): def run_tests(self, test_suite):
""" run tests with unittest_runner and test_suite """ run tests in test_suite
Args: Args:
unittest_runner: unittest.TextTestRunner()
test_suite: unittest.TestSuite() test_suite: unittest.TestSuite()
Returns: Returns:
@@ -261,7 +259,7 @@ class HttpRunner(object):
testcase_name = testcase.config.get("name") testcase_name = testcase.config.get("name")
logger.log_info("Start to run testcase: {}".format(testcase_name)) logger.log_info("Start to run testcase: {}".format(testcase_name))
result = unittest_runner.run(testcase) result = self.unittest_runner.run(testcase)
tests_results.append((testcase, result)) tests_results.append((testcase, result))
return tests_results return tests_results
@@ -328,10 +326,10 @@ class HttpRunner(object):
parsed_testcases_list = self.parse_tests(testcases_list) parsed_testcases_list = self.parse_tests(testcases_list)
# initialize # initialize
unittest_runner, test_suite = self.initialize(parsed_testcases_list) test_suite = self.initialize(parsed_testcases_list)
# running tests # running tests
results = self.run_tests(unittest_runner, test_suite) results = self.run_tests(test_suite)
# aggregate # aggregate
self.aggregate(results) self.aggregate(results)

2
tests/test_api.py
View File

@@ -350,7 +350,7 @@ class TestHttpRunner(ApiServerUnittest):
runner = HttpRunner() runner = HttpRunner()
testcases = runner.load_tests(testcase_file_path) testcases = runner.load_tests(testcase_file_path)
parsed_testcases = runner.parse_tests(testcases) parsed_testcases = runner.parse_tests(testcases)
unittest_runner, test_suite = runner.initialize(parsed_testcases) test_suite = runner.initialize(parsed_testcases)
self.assertEqual( self.assertEqual(
test_suite._tests[0].teststeps[0]['name'], test_suite._tests[0].teststeps[0]['name'],