fix 4810889d86238ab08ee5f18996b9509539420b0a: import locust may lead to RecursionError

This commit is contained in:
debugtalk
2018-12-04 19:36:48 +08:00
parent 50d0ef01ae
commit 60422c274f
4 changed files with 34 additions and 39 deletions

View File

@@ -1,22 +1,16 @@
# encoding: utf-8
import argparse
import multiprocessing
import os
import sys
import unittest
from httprunner import logger
from httprunner.__about__ import __description__, __version__
from httprunner.api import HttpRunner
from httprunner.compat import is_py2
from httprunner.utils import (create_scaffold, get_python2_retire_msg,
prettify_json_file, validate_json_file)
def main_hrun():
""" API test: parse command line options and run commands.
"""
import argparse
from httprunner import logger
from httprunner.__about__ import __description__, __version__
from httprunner.api import HttpRunner
from httprunner.compat import is_py2
from httprunner.utils import (create_scaffold, get_python2_retire_msg,
prettify_json_file, validate_json_file)
parser = argparse.ArgumentParser(description=__description__)
parser.add_argument(
'-V', '--version', dest='version', action='store_true',
@@ -92,9 +86,14 @@ def main_hrun():
return 0
def main_locust():
""" Performance test with locust: parse command line options and run commands.
"""
import multiprocessing
import sys
from httprunner import logger
try:
from httprunner import locusts
except ImportError:
@@ -108,7 +107,7 @@ def main_locust():
sys.argv.extend(["-h"])
if sys.argv[1] in ["-h", "--help", "-V", "--version"]:
locusts.main()
locusts.start_locust_main()
sys.exit(0)
# set logging level
@@ -174,4 +173,4 @@ def main_locust():
sys.argv.pop(processes_index)
locusts.run_locusts_with_processes(sys.argv, processes_count)
else:
locusts.main()
locusts.start_locust_main()