mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-22 08:50:13 +08:00
update: adjust format
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
# encoding: utf-8
|
||||
|
||||
|
||||
def main_hrun():
|
||||
""" API test: parse command line options and run commands.
|
||||
"""
|
||||
@@ -11,7 +12,7 @@ def main_hrun():
|
||||
from httprunner.compat import is_py2
|
||||
from httprunner.validator import validate_json_file
|
||||
from httprunner.utils import (create_scaffold, get_python2_retire_msg,
|
||||
prettify_json_file)
|
||||
prettify_json_file)
|
||||
|
||||
parser = argparse.ArgumentParser(description=__description__)
|
||||
parser.add_argument(
|
||||
|
||||
@@ -17,10 +17,12 @@ try:
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
|
||||
###############################################################################
|
||||
## file loader
|
||||
# file loader
|
||||
###############################################################################
|
||||
|
||||
|
||||
def _check_format(file_path, content):
|
||||
""" check testcase format if valid
|
||||
"""
|
||||
@@ -239,9 +241,10 @@ def locate_file(start_path, file_name):
|
||||
|
||||
|
||||
###############################################################################
|
||||
## debugtalk.py module loader
|
||||
# debugtalk.py module loader
|
||||
###############################################################################
|
||||
|
||||
|
||||
def load_module_functions(module):
|
||||
""" load python module functions.
|
||||
|
||||
@@ -290,9 +293,10 @@ def load_debugtalk_functions():
|
||||
|
||||
|
||||
###############################################################################
|
||||
## testcase loader
|
||||
# testcase loader
|
||||
###############################################################################
|
||||
|
||||
|
||||
project_mapping = {}
|
||||
tests_def_mapping = {
|
||||
"PWD": None,
|
||||
@@ -720,14 +724,16 @@ def load_api_folder(api_folder_path):
|
||||
if isinstance(api_items, list):
|
||||
for api_item in api_items:
|
||||
key, api_dict = api_item.popitem()
|
||||
api_id = api_dict.get("id") or api_dict.get("def") or api_dict.get("name")
|
||||
api_id = api_dict.get("id") or api_dict.get("def") \
|
||||
or api_dict.get("name")
|
||||
if key != "api" or not api_id:
|
||||
raise exceptions.ParamsError(
|
||||
"Invalid API defined in {}".format(api_file_path))
|
||||
|
||||
if api_id in api_definition_mapping:
|
||||
raise exceptions.ParamsError(
|
||||
"Duplicated API ({}) defined in {}".format(api_id, api_file_path))
|
||||
"Duplicated API ({}) defined in {}".format(
|
||||
api_id, api_file_path))
|
||||
else:
|
||||
api_definition_mapping[api_id] = api_dict
|
||||
|
||||
@@ -745,7 +751,8 @@ def locate_debugtalk_py(start_path):
|
||||
""" locate debugtalk.py file
|
||||
|
||||
Args:
|
||||
start_path (str): start locating path, maybe testcase file path or directory path
|
||||
start_path (str): start locating path,
|
||||
maybe testcase file path or directory path
|
||||
|
||||
Returns:
|
||||
str: debugtalk.py file path, None if not found
|
||||
@@ -769,7 +776,8 @@ def load_project_tests(test_path, dot_env_path=None):
|
||||
dot_env_path (str): specified .env file path
|
||||
|
||||
Returns:
|
||||
dict: project loaded api/testcases definitions, environments and debugtalk.py functions.
|
||||
dict: project loaded api/testcases definitions,
|
||||
environments and debugtalk.py functions.
|
||||
|
||||
"""
|
||||
# locate debugtalk.py file
|
||||
@@ -876,6 +884,7 @@ def load_tests(path, dot_env_path=None):
|
||||
}
|
||||
|
||||
def __load_file_content(path):
|
||||
loaded_content = None
|
||||
try:
|
||||
loaded_content = load_test_file(path)
|
||||
except exceptions.FileFormatError:
|
||||
|
||||
Reference in New Issue
Block a user