mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-12 02:21:29 +08:00
fix: run testcases by folder path
This commit is contained in:
@@ -65,10 +65,7 @@ def main_ate():
|
||||
|
||||
try:
|
||||
task_suite = TaskSuite(testset_path)
|
||||
except exception.FileFormatError:
|
||||
success = False
|
||||
continue
|
||||
except exception.FileNotFoundError:
|
||||
except exception.TestcaseNotFound:
|
||||
success = False
|
||||
continue
|
||||
|
||||
|
||||
@@ -29,14 +29,20 @@ class ParseResponseError(MyBaseError):
|
||||
class ValidationError(MyBaseError):
|
||||
pass
|
||||
|
||||
class FunctionNotFound(NameError):
|
||||
class NotFoundError(MyBaseError):
|
||||
pass
|
||||
|
||||
class VariableNotFound(NameError):
|
||||
class FunctionNotFound(NotFoundError):
|
||||
pass
|
||||
|
||||
class ApiNotFound(NameError):
|
||||
class VariableNotFound(NotFoundError):
|
||||
pass
|
||||
|
||||
class SuiteNotFound(NameError):
|
||||
class ApiNotFound(NotFoundError):
|
||||
pass
|
||||
|
||||
class SuiteNotFound(NotFoundError):
|
||||
pass
|
||||
|
||||
class TestcaseNotFound(NotFoundError):
|
||||
pass
|
||||
|
||||
@@ -52,7 +52,7 @@ class TaskSuite(unittest.TestSuite):
|
||||
self.suite_list = []
|
||||
testsets = testcase.load_testcases_by_path(testcase_path)
|
||||
if not testsets:
|
||||
raise exception.FileNotFoundError
|
||||
raise exception.TestcaseNotFound
|
||||
|
||||
for testset in testsets:
|
||||
suite = ApiTestSuite(testset)
|
||||
|
||||
@@ -49,6 +49,8 @@ def _load_file(testcase_file_path):
|
||||
return _load_yaml_file(testcase_file_path)
|
||||
else:
|
||||
# '' or other suffix
|
||||
err_msg = "file is not in YAML/JSON format: {}".format(testcase_file_path)
|
||||
logging.warning(err_msg)
|
||||
return []
|
||||
|
||||
def extract_variables(content):
|
||||
@@ -194,10 +196,13 @@ def load_testcases_by_path(path):
|
||||
testcases_list = load_testcases_by_path(files_list)
|
||||
|
||||
elif os.path.isfile(path):
|
||||
testset = load_test_file(path)
|
||||
if testset["testcases"] or testset["api"]:
|
||||
testcases_list = [testset]
|
||||
else:
|
||||
try:
|
||||
testset = load_test_file(path)
|
||||
if testset["testcases"] or testset["api"]:
|
||||
testcases_list = [testset]
|
||||
else:
|
||||
testcases_list = []
|
||||
except exception.FileFormatError:
|
||||
testcases_list = []
|
||||
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user