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

refactor: rename module name, loader/cases -> loader/buildup

Browse Source
This commit is contained in:
debugtalk
2019-12-10 16:33:37 +08:00
parent 2bfad80691
commit a8641dea34
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
httprunner/loader/__init__.py
View File

@@ -1,6 +1,16 @@
from httprunner.loader.cases import load_cases, load_project_data """
HttpRunner loader
- check: validate testcase data structure with JSON schema (TODO)
- locate: locate debugtalk.py, make it's dir as project root path
- load: load testcase files and relevant data, including debugtalk.py, .env, yaml/json api/testcases, csv, etc.
- buildup: assemble loaded content to httprunner testcase/testsuite data structure
"""
from httprunner.loader.check import is_testcase_path, is_testcases, validate_json_file from httprunner.loader.check import is_testcase_path, is_testcases, validate_json_file
from httprunner.loader.load import load_csv_file, load_builtin_functions from httprunner.loader.load import load_csv_file, load_builtin_functions
from httprunner.loader.buildup import load_cases, load_project_data
__all__ = [ __all__ = [
"is_testcase_path", "is_testcase_path",

0
httprunner/loader/cases.py → httprunner/loader/buildup.py
View File

44
tests/test_loader/test_cases.py
View File

@@ -3,21 +3,21 @@ import os
import unittest import unittest
from httprunner import exceptions, loader from httprunner import exceptions, loader
from httprunner.loader import cases from httprunner.loader import buildup
class TestModuleLoader(unittest.TestCase): class TestModuleLoader(unittest.TestCase):
def test_filter_module_functions(self): def test_filter_module_functions(self):
module_functions = cases.load_module_functions(cases) module_functions = buildup.load_module_functions(buildup)
self.assertIn("load_module_functions", module_functions) self.assertIn("load_module_functions", module_functions)
self.assertNotIn("is_py3", module_functions) self.assertNotIn("is_py3", module_functions)
def test_load_debugtalk_module(self): def test_load_debugtalk_module(self):
project_mapping = cases.load_project_data(os.path.join(os.getcwd(), "httprunner")) project_mapping = buildup.load_project_data(os.path.join(os.getcwd(), "httprunner"))
self.assertNotIn("alter_response", project_mapping["functions"]) self.assertNotIn("alter_response", project_mapping["functions"])
project_mapping = cases.load_project_data(os.path.join(os.getcwd(), "tests")) project_mapping = buildup.load_project_data(os.path.join(os.getcwd(), "tests"))
self.assertIn("alter_response", project_mapping["functions"]) self.assertIn("alter_response", project_mapping["functions"])
is_status_code_200 = project_mapping["functions"]["is_status_code_200"] is_status_code_200 = project_mapping["functions"]["is_status_code_200"]
@@ -25,7 +25,7 @@ class TestModuleLoader(unittest.TestCase):
self.assertFalse(is_status_code_200(500)) self.assertFalse(is_status_code_200(500))
def test_load_debugtalk_py(self): def test_load_debugtalk_py(self):
project_mapping = cases.load_project_data("tests/data/demo_testcase.yml") project_mapping = buildup.load_project_data("tests/data/demo_testcase.yml")
project_working_directory = project_mapping["PWD"] project_working_directory = project_mapping["PWD"]
debugtalk_functions = project_mapping["functions"] debugtalk_functions = project_mapping["functions"]
self.assertEqual( self.assertEqual(
@@ -34,7 +34,7 @@ class TestModuleLoader(unittest.TestCase):
) )
self.assertIn("gen_md5", debugtalk_functions) self.assertIn("gen_md5", debugtalk_functions)
project_mapping = cases.load_project_data("tests/base.py") project_mapping = buildup.load_project_data("tests/base.py")
project_working_directory = project_mapping["PWD"] project_working_directory = project_mapping["PWD"]
debugtalk_functions = project_mapping["functions"] debugtalk_functions = project_mapping["functions"]
self.assertEqual( self.assertEqual(
@@ -43,7 +43,7 @@ class TestModuleLoader(unittest.TestCase):
) )
self.assertIn("gen_md5", debugtalk_functions) self.assertIn("gen_md5", debugtalk_functions)
project_mapping = cases.load_project_data("httprunner/__init__.py") project_mapping = buildup.load_project_data("httprunner/__init__.py")
project_working_directory = project_mapping["PWD"] project_working_directory = project_mapping["PWD"]
debugtalk_functions = project_mapping["functions"] debugtalk_functions = project_mapping["functions"]
self.assertEqual( self.assertEqual(
@@ -57,8 +57,8 @@ class TestSuiteLoader(unittest.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.project_mapping = cases.load_project_data(os.path.join(os.getcwd(), "tests")) cls.project_mapping = buildup.load_project_data(os.path.join(os.getcwd(), "tests"))
cls.tests_def_mapping = cases.tests_def_mapping cls.tests_def_mapping = buildup.tests_def_mapping
def test_load_teststep_api(self): def test_load_teststep_api(self):
raw_test = { raw_test = {
@@ -68,7 +68,7 @@ class TestSuiteLoader(unittest.TestCase):
{"uid": "999"} {"uid": "999"}
] ]
} }
teststep = cases.load_teststep(raw_test) teststep = buildup.load_teststep(raw_test)
self.assertEqual( self.assertEqual(
"create user (override).", "create user (override).",
teststep["name"] teststep["name"]
@@ -86,7 +86,7 @@ class TestSuiteLoader(unittest.TestCase):
{"device_sn": "$device_sn"} {"device_sn": "$device_sn"}
] ]
} }
testcase = cases.load_teststep(raw_test) testcase = buildup.load_teststep(raw_test)
self.assertEqual( self.assertEqual(
"setup and reset all (override).", "setup and reset all (override).",
testcase["name"] testcase["name"]
@@ -97,7 +97,7 @@ class TestSuiteLoader(unittest.TestCase):
self.assertEqual(tests[1]["name"], "reset all users") self.assertEqual(tests[1]["name"], "reset all users")
def test_load_test_file_api(self): def test_load_test_file_api(self):
loaded_content = cases.load_test_file("tests/api/create_user.yml") loaded_content = buildup.load_test_file("tests/api/create_user.yml")
self.assertEqual(loaded_content["type"], "api") self.assertEqual(loaded_content["type"], "api")
self.assertIn("path", loaded_content) self.assertIn("path", loaded_content)
self.assertIn("request", loaded_content) self.assertIn("request", loaded_content)
@@ -105,8 +105,8 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_test_file_testcase(self): def test_load_test_file_testcase(self):
for loaded_content in [ for loaded_content in [
cases.load_test_file("tests/testcases/setup.yml"), buildup.load_test_file("tests/testcases/setup.yml"),
cases.load_test_file("tests/testcases/setup.json") buildup.load_test_file("tests/testcases/setup.json")
]: ]:
self.assertEqual(loaded_content["type"], "testcase") self.assertEqual(loaded_content["type"], "testcase")
self.assertIn("path", loaded_content) self.assertIn("path", loaded_content)
@@ -117,8 +117,8 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_test_file_testcase_v2(self): def test_load_test_file_testcase_v2(self):
for loaded_content in [ for loaded_content in [
cases.load_test_file("tests/testcases/setup.v2.yml"), buildup.load_test_file("tests/testcases/setup.v2.yml"),
cases.load_test_file("tests/testcases/setup.v2.json") buildup.load_test_file("tests/testcases/setup.v2.json")
]: ]:
self.assertEqual(loaded_content["type"], "testcase") self.assertEqual(loaded_content["type"], "testcase")
self.assertIn("path", loaded_content) self.assertIn("path", loaded_content)
@@ -129,8 +129,8 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_test_file_testsuite(self): def test_load_test_file_testsuite(self):
for loaded_content in [ for loaded_content in [
cases.load_test_file("tests/testsuites/create_users.yml"), buildup.load_test_file("tests/testsuites/create_users.yml"),
cases.load_test_file("tests/testsuites/create_users.json") buildup.load_test_file("tests/testsuites/create_users.json")
]: ]:
self.assertEqual(loaded_content["type"], "testsuite") self.assertEqual(loaded_content["type"], "testsuite")
@@ -145,8 +145,8 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_test_file_testsuite_v2(self): def test_load_test_file_testsuite_v2(self):
for loaded_content in [ for loaded_content in [
cases.load_test_file("tests/testsuites/create_users.v2.yml"), buildup.load_test_file("tests/testsuites/create_users.v2.yml"),
cases.load_test_file("tests/testsuites/create_users.v2.json") buildup.load_test_file("tests/testsuites/create_users.v2.json")
]: ]:
self.assertEqual(loaded_content["type"], "testsuite") self.assertEqual(loaded_content["type"], "testsuite")
@@ -279,13 +279,13 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_api_folder(self): def test_load_api_folder(self):
path = os.path.join(os.getcwd(), "tests", "api") path = os.path.join(os.getcwd(), "tests", "api")
api_definition_mapping = cases.load_api_folder(path) api_definition_mapping = buildup.load_api_folder(path)
api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml") api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml")
self.assertIn(api_file_path, api_definition_mapping) self.assertIn(api_file_path, api_definition_mapping)
self.assertIn("request", api_definition_mapping[api_file_path]) self.assertIn("request", api_definition_mapping[api_file_path])
def test_load_project_tests(self): def test_load_project_tests(self):
cases.load_project_data(os.path.join(os.getcwd(), "tests")) buildup.load_project_data(os.path.join(os.getcwd(), "tests"))
api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml") api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml")
self.assertIn(api_file_path, self.tests_def_mapping["api"]) self.assertIn(api_file_path, self.tests_def_mapping["api"])
self.assertEqual(self.project_mapping["env"]["PROJECT_KEY"], "ABCDEFGH") self.assertEqual(self.project_mapping["env"]["PROJECT_KEY"], "ABCDEFGH")

2
tests/test_parser.py
View File

@@ -1376,7 +1376,7 @@ class TestParser(unittest.TestCase):
"base_url": "https://github.com", "base_url": "https://github.com",
"api": "api/get_token.yml", "api": "api/get_token.yml",
} }
api_def_dict = loader.cases.load_teststep(raw_testinfo) api_def_dict = loader.buildup.load_teststep(raw_testinfo)
test_block = { test_block = {
"name": "override block", "name": "override block",
"times": 3, "times": 3,

3
tests/test_runner.py
View File

@@ -2,7 +2,6 @@ import os
import time import time
from httprunner import loader, parser, runner from httprunner import loader, parser, runner
from httprunner.loader import cases
from tests.api_server import HTTPBIN_SERVER from tests.api_server import HTTPBIN_SERVER
from tests.base import ApiServerUnittest from tests.base import ApiServerUnittest
@@ -10,7 +9,7 @@ from tests.base import ApiServerUnittest
class TestRunner(ApiServerUnittest): class TestRunner(ApiServerUnittest):
def setUp(self): def setUp(self):
project_mapping = cases.load_project_data(os.path.join(os.getcwd(), "tests")) project_mapping = loader.load_project_data(os.path.join(os.getcwd(), "tests"))
self.debugtalk_functions = project_mapping["functions"] self.debugtalk_functions = project_mapping["functions"]
config = { config = {