From 9b5f1506041b66f470f8bd7ef613e6d3ae7f286d Mon Sep 17 00:00:00 2001 From: debugtalk Date: Fri, 13 Dec 2019 10:38:30 +0800 Subject: [PATCH] refactor: rename plugin to extention, httprunner/plugins -> httprunner/ext --- httprunner/{plugins => ext}/__init__.py | 2 +- httprunner/{plugins => ext}/locusts/README.md | 0 httprunner/{plugins => ext}/locusts/__init__.py | 0 httprunner/ext/locusts/__main__.py | 4 ++++ httprunner/{plugins => ext}/locusts/cli.py | 0 httprunner/{plugins => ext}/locusts/locustfile_template.py | 2 +- httprunner/{plugins => ext}/locusts/utils.py | 0 httprunner/{plugins => ext}/uploader/__init__.py | 6 +++--- httprunner/parser.py | 6 +++--- httprunner/plugins/locusts/__main__.py | 4 ---- tests/{test_plugins => test_extension}/__init__.py | 0 tests/{test_plugins => test_extension}/test_locusts.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename httprunner/{plugins => ext}/__init__.py (64%) rename httprunner/{plugins => ext}/locusts/README.md (100%) rename httprunner/{plugins => ext}/locusts/__init__.py (100%) create mode 100644 httprunner/ext/locusts/__main__.py rename httprunner/{plugins => ext}/locusts/cli.py (100%) rename httprunner/{plugins => ext}/locusts/locustfile_template.py (94%) rename httprunner/{plugins => ext}/locusts/utils.py (100%) rename httprunner/{plugins => ext}/uploader/__init__.py (95%) delete mode 100644 httprunner/plugins/locusts/__main__.py rename tests/{test_plugins => test_extension}/__init__.py (100%) rename tests/{test_plugins => test_extension}/test_locusts.py (89%) diff --git a/httprunner/plugins/__init__.py b/httprunner/ext/__init__.py similarity index 64% rename from httprunner/plugins/__init__.py rename to httprunner/ext/__init__.py index 1802047f..2ce5da7e 100644 --- a/httprunner/plugins/__init__.py +++ b/httprunner/ext/__init__.py @@ -1,2 +1,2 @@ # NOTICE: -# This file should not be deleted, or ImportError will be raised in Python 2.7 when importing plugin +# This file should not be deleted, or ImportError will be raised in Python 2.7 when importing extension diff --git a/httprunner/plugins/locusts/README.md b/httprunner/ext/locusts/README.md similarity index 100% rename from httprunner/plugins/locusts/README.md rename to httprunner/ext/locusts/README.md diff --git a/httprunner/plugins/locusts/__init__.py b/httprunner/ext/locusts/__init__.py similarity index 100% rename from httprunner/plugins/locusts/__init__.py rename to httprunner/ext/locusts/__init__.py diff --git a/httprunner/ext/locusts/__main__.py b/httprunner/ext/locusts/__main__.py new file mode 100644 index 00000000..bc8d706f --- /dev/null +++ b/httprunner/ext/locusts/__main__.py @@ -0,0 +1,4 @@ +from httprunner.ext.locusts.cli import main + +if __name__ == "__main__": + main() diff --git a/httprunner/plugins/locusts/cli.py b/httprunner/ext/locusts/cli.py similarity index 100% rename from httprunner/plugins/locusts/cli.py rename to httprunner/ext/locusts/cli.py diff --git a/httprunner/plugins/locusts/locustfile_template.py b/httprunner/ext/locusts/locustfile_template.py similarity index 94% rename from httprunner/plugins/locusts/locustfile_template.py rename to httprunner/ext/locusts/locustfile_template.py index 72697cfa..1ad06eb7 100644 --- a/httprunner/plugins/locusts/locustfile_template.py +++ b/httprunner/ext/locusts/locustfile_template.py @@ -5,7 +5,7 @@ from locust import HttpLocust, TaskSet, task from locust.events import request_failure from httprunner.exceptions import MyBaseError, MyBaseFailure -from httprunner.plugins.locusts.utils import prepare_locust_tests +from httprunner.ext.locusts.utils import prepare_locust_tests from httprunner.runner import Runner logging.getLogger().setLevel(logging.CRITICAL) diff --git a/httprunner/plugins/locusts/utils.py b/httprunner/ext/locusts/utils.py similarity index 100% rename from httprunner/plugins/locusts/utils.py rename to httprunner/ext/locusts/utils.py diff --git a/httprunner/plugins/uploader/__init__.py b/httprunner/ext/uploader/__init__.py similarity index 95% rename from httprunner/plugins/uploader/__init__.py rename to httprunner/ext/uploader/__init__.py index b432a1a6..404d635b 100644 --- a/httprunner/plugins/uploader/__init__.py +++ b/httprunner/ext/uploader/__init__.py @@ -1,6 +1,6 @@ -""" upload test plugin. +""" upload test extension. -If you want to use this plugin, you should install the following dependencies first. +If you want to use this extension, you should install the following dependencies first. - requests_toolbelt - filetype @@ -50,7 +50,7 @@ try: from requests_toolbelt import MultipartEncoder except ImportError: msg = """ -uploader plugin dependencies uninstalled, install first and try again. +uploader extension dependencies uninstalled, install first and try again. install with pip: $ pip install requests_toolbelt filetype """ diff --git a/httprunner/parser.py b/httprunner/parser.py index cc6f13aa..ed642d0c 100644 --- a/httprunner/parser.py +++ b/httprunner/parser.py @@ -429,8 +429,8 @@ def get_mapping_function(function_name, functions_mapping): return utils.get_os_environ elif function_name in ["multipart_encoder", "multipart_content_type"]: - # plugin for upload test - from httprunner.plugins import uploader + # extension for upload test + from httprunner.ext import uploader return getattr(uploader, function_name) try: @@ -1158,7 +1158,7 @@ def __prepare_testcase_tests(tests, config, project_mapping, session_variables_s test_dict["request"]["verify"] = config_verify if "upload" in test_dict["request"]: - from httprunner.plugins.uploader import prepare_upload_test + from httprunner.ext.uploader import prepare_upload_test prepare_upload_test(test_dict) # current teststep variables diff --git a/httprunner/plugins/locusts/__main__.py b/httprunner/plugins/locusts/__main__.py deleted file mode 100644 index dbf8961f..00000000 --- a/httprunner/plugins/locusts/__main__.py +++ /dev/null @@ -1,4 +0,0 @@ -from httprunner.plugins.locusts.cli import main - -if __name__ == "__main__": - main() diff --git a/tests/test_plugins/__init__.py b/tests/test_extension/__init__.py similarity index 100% rename from tests/test_plugins/__init__.py rename to tests/test_extension/__init__.py diff --git a/tests/test_plugins/test_locusts.py b/tests/test_extension/test_locusts.py similarity index 89% rename from tests/test_plugins/test_locusts.py rename to tests/test_extension/test_locusts.py index f838d05e..59d957ff 100644 --- a/tests/test_plugins/test_locusts.py +++ b/tests/test_extension/test_locusts.py @@ -1,7 +1,7 @@ import os import unittest -from httprunner.plugins.locusts.utils import prepare_locust_tests +from httprunner.ext.locusts.utils import prepare_locust_tests class TestLocust(unittest.TestCase):