From 7e42fa34cfe0e2d377ca6b3e78fd20444e1a1b74 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 21 Apr 2020 23:27:18 +0800 Subject: [PATCH] change: remove unused code --- httprunner/v3/exceptions/__init__.py | 81 ---------------------------- httprunner/v3/parser.py | 2 +- httprunner/v3/parser_test.py | 2 +- httprunner/v3/response.py | 2 +- httprunner/v3/runner.py | 2 +- httprunner/v3/validator.py | 2 +- 6 files changed, 5 insertions(+), 86 deletions(-) delete mode 100644 httprunner/v3/exceptions/__init__.py diff --git a/httprunner/v3/exceptions/__init__.py b/httprunner/v3/exceptions/__init__.py deleted file mode 100644 index 77d1be52..00000000 --- a/httprunner/v3/exceptions/__init__.py +++ /dev/null @@ -1,81 +0,0 @@ -""" failure type exceptions - these exceptions will mark test as failure -""" - - -class MyBaseFailure(Exception): - pass - - -class ParseTestsFailure(MyBaseFailure): - pass - - -class ValidationFailure(MyBaseFailure): - pass - - -class ExtractFailure(MyBaseFailure): - pass - - -class SetupHooksFailure(MyBaseFailure): - pass - - -class TeardownHooksFailure(MyBaseFailure): - pass - - -""" error type exceptions - these exceptions will mark test as error -""" - - -class MyBaseError(Exception): - pass - - -class FileFormatError(MyBaseError): - pass - - -class ParamsError(MyBaseError): - pass - - -class NotFoundError(MyBaseError): - pass - - -class FileNotFound(FileNotFoundError, NotFoundError): - pass - - -class FunctionNotFound(NotFoundError): - pass - - -class VariableNotFound(NotFoundError): - pass - - -class EnvNotFound(NotFoundError): - pass - - -class CSVNotFound(NotFoundError): - pass - - -class ApiNotFound(NotFoundError): - pass - - -class TestcaseNotFound(NotFoundError): - pass - - -class SummaryEmpty(MyBaseError): - """ test result summary data is empty - """ diff --git a/httprunner/v3/parser.py b/httprunner/v3/parser.py index c0e12c7a..12aa9e7b 100644 --- a/httprunner/v3/parser.py +++ b/httprunner/v3/parser.py @@ -4,7 +4,7 @@ import re from typing import Any, Set, Text, Callable, List, Dict from httprunner import loader, utils -from httprunner.v3 import exceptions +from httprunner import exceptions from httprunner.v3.schema import VariablesMapping, FunctionsMapping absolute_http_url_regexp = re.compile(r"^https?://", re.I) diff --git a/httprunner/v3/parser_test.py b/httprunner/v3/parser_test.py index ee42c525..9d9ec9e6 100644 --- a/httprunner/v3/parser_test.py +++ b/httprunner/v3/parser_test.py @@ -2,7 +2,7 @@ import time import unittest from httprunner.v3 import parser -from httprunner.v3.exceptions import VariableNotFound, FunctionNotFound +from httprunner.exceptions import VariableNotFound, FunctionNotFound class TestParserBasic(unittest.TestCase): diff --git a/httprunner/v3/response.py b/httprunner/v3/response.py index ce4dde7c..57f47eae 100644 --- a/httprunner/v3/response.py +++ b/httprunner/v3/response.py @@ -4,7 +4,7 @@ import jmespath import requests from loguru import logger -from httprunner.v3.exceptions import ValidationFailure, ParamsError +from httprunner.exceptions import ValidationFailure, ParamsError from httprunner.v3.parser import parse_data, parse_string_value, get_mapping_function from httprunner.v3.schema import VariablesMapping, Validators, FunctionsMapping from httprunner.v3.validator import uniform_validator diff --git a/httprunner/v3/runner.py b/httprunner/v3/runner.py index 33b2e1f5..4de890d8 100644 --- a/httprunner/v3/runner.py +++ b/httprunner/v3/runner.py @@ -4,7 +4,7 @@ from loguru import logger from httprunner import utils from httprunner.client import HttpSession -from httprunner.v3.exceptions import ValidationFailure +from httprunner.exceptions import ValidationFailure from httprunner.v3.parser import build_url, parse_data, parse_variables_mapping from httprunner.v3.response import ResponseObject from httprunner.v3.schema import TestsConfig, TestStep, VariablesMapping, TestCase diff --git a/httprunner/v3/validator.py b/httprunner/v3/validator.py index c1278c2e..3df458f3 100644 --- a/httprunner/v3/validator.py +++ b/httprunner/v3/validator.py @@ -1,6 +1,6 @@ from typing import Text -from httprunner.v3.exceptions import ParamsError +from httprunner.exceptions import ParamsError def get_uniform_comparator(comparator: Text):