diff --git a/httprunner/cli.py b/httprunner/cli.py index 011c3c70..4ea2583b 100644 --- a/httprunner/cli.py +++ b/httprunner/cli.py @@ -6,10 +6,10 @@ import pytest from loguru import logger from httprunner import __description__, __version__ -from httprunner.ext.har2case import init_har2case_parser, main_har2case -from httprunner.ext.make import init_make_parser, main_make -from httprunner.ext.scaffold import init_parser_scaffold, main_scaffold from httprunner.compat import ensure_cli_args +from httprunner.ext.har2case import init_har2case_parser, main_har2case +from httprunner.ext.scaffold import init_parser_scaffold, main_scaffold +from httprunner.make import init_make_parser, main_make def init_parser_run(subparsers): diff --git a/httprunner/ext/make/__init__.py b/httprunner/make.py similarity index 99% rename from httprunner/ext/make/__init__.py rename to httprunner/make.py index e6a1d6ef..749131dc 100644 --- a/httprunner/ext/make/__init__.py +++ b/httprunner/make.py @@ -4,6 +4,8 @@ import subprocess from typing import Text, List, Tuple, Dict, Set, NoReturn import jinja2 +from loguru import logger + from httprunner import exceptions from httprunner.compat import ensure_testcase_v3_api, ensure_testcase_v3 from httprunner.loader import ( @@ -14,7 +16,6 @@ from httprunner.loader import ( load_project_meta, ) from httprunner.parser import parse_data -from loguru import logger """ cache converted pytest files, avoid duplicate making """ diff --git a/tests/ext/make_test.py b/tests/make_test.py similarity index 97% rename from tests/ext/make_test.py rename to tests/make_test.py index f0b55818..cabb27ed 100644 --- a/tests/ext/make_test.py +++ b/tests/make_test.py @@ -1,6 +1,6 @@ import unittest -from httprunner.ext.make import main_make, convert_testcase_path, make_files_cache_set +from httprunner.make import main_make, convert_testcase_path, make_files_cache_set class TestLoader(unittest.TestCase):