feat: add make sub command

This commit is contained in:
debugtalk
2020-05-14 23:38:47 +08:00
parent 6c29ea3554
commit f13a3e4134
3 changed files with 30 additions and 8 deletions

View File

@@ -25,6 +25,7 @@ from httprunner.api import HttpRunner
from httprunner.ext.har2case import init_har2case_parser, main_har2case
from httprunner.ext.scaffold import init_parser_scaffold, main_scaffold
from httprunner.ext.locusts import init_parser_locusts, main_locusts
from httprunner.ext.make import init_make_parser, main_make
def init_parser_run(subparsers):
@@ -99,6 +100,7 @@ def main():
sub_parser_scaffold = init_parser_scaffold(subparsers)
sub_parser_har2case = init_har2case_parser(subparsers)
sub_parser_locusts = init_parser_locusts(subparsers)
sub_parser_make = init_make_parser(subparsers)
extra_args = []
if len(sys.argv) >= 2 and sys.argv[1] == "locusts":
@@ -111,12 +113,12 @@ def main():
sys.exit(0)
if len(sys.argv) == 1:
# hrun
# httprunner
parser.print_help()
sys.exit(0)
elif sys.argv[1] == "run":
# hrun run
# httprunner run
if len(sys.argv) == 2:
sub_parser_run.print_help()
sys.exit(0)
@@ -124,7 +126,7 @@ def main():
main_run(args)
elif sys.argv[1] == "startproject":
# hrun startproject
# httprunner startproject
if len(sys.argv) == 2:
sub_parser_scaffold.print_help()
sys.exit(0)
@@ -132,7 +134,7 @@ def main():
main_scaffold(args)
elif sys.argv[1] == "har2case":
# hrun har2case
# httprunner har2case
if len(sys.argv) == 2:
sub_parser_har2case.print_help()
sys.exit(0)
@@ -140,13 +142,21 @@ def main():
main_har2case(args)
elif sys.argv[1] == "locusts":
# hrun locusts
# httprunner locusts
if len(sys.argv) == 2:
sub_parser_locusts.print_help()
sys.exit(0)
main_locusts(args, extra_args)
elif sys.argv[1] == "make":
# httprunner make
if len(sys.argv) == 2:
sub_parser_make.print_help()
sys.exit(0)
main_make(args.testcase_path)
def main_hrun_alias():
""" command alias

View File

@@ -55,7 +55,7 @@ def make_testcase(testcase_path: str) -> str:
return testcase_python_path
def make(tests_path: str) -> list:
def main_make(tests_path: str) -> list:
testcases = []
if os.path.isdir(tests_path):
files_list = load_folder_files(tests_path)
@@ -69,3 +69,15 @@ def make(tests_path: str) -> list:
make_testcase(testcase_path)
for testcase_path in testcases
]
def init_make_parser(subparsers):
""" make testcases: parse command line options and run commands.
"""
parser = subparsers.add_parser(
"make",
help="Convert YAML/JSON testcases to Python unittests.",
)
parser.add_argument("testcase_path", nargs="?", help="Specify YAML/JSON testcase path")
return parser

View File

@@ -1,5 +1,5 @@
import unittest
from httprunner.make import make_testcase, make
from httprunner.ext.make import make_testcase, main_make
class TestLoader(unittest.TestCase):
@@ -14,7 +14,7 @@ class TestLoader(unittest.TestCase):
def test_make_testcase_folder(self):
path = "examples/postman_echo/request_methods/"
testcase_python_list = make(path)
testcase_python_list = main_make(path)
self.assertIn(
"examples/postman_echo/request_methods/request_with_functions_test.py",
testcase_python_list