refactor: rename schema to models

This commit is contained in:
debugtalk
2020-06-05 10:35:09 +08:00
parent b31f4374c6
commit 528ddd0c67
25 changed files with 25 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/httpbin/basic.yml # FROM: examples/httpbin/basic.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/httpbin/hooks.yml # FROM: examples/httpbin/hooks.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/httpbin/load_image.yml # FROM: examples/httpbin/load_image.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/httpbin/upload.yml # FROM: examples/httpbin/upload.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/httpbin/validate.yml # FROM: examples/httpbin/validate.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -2,7 +2,7 @@ import unittest
import requests import requests
from httprunner.runner import HttpRunner from httprunner.runner import HttpRunner
from httprunner.schema import TConfig, TStep from httprunner.models import TConfig, TStep
class TestCaseSetDeleteCookies(unittest.TestCase): class TestCaseSetDeleteCookies(unittest.TestCase):

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/request_with_functions.yml # FROM: examples/postman_echo/request_methods/request_with_functions.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml
import os import os

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/hardcode.yml # FROM: examples/postman_echo/request_methods/hardcode.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/request_with_functions.yml # FROM: examples/postman_echo/request_methods/request_with_functions.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml
import os import os

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/request_with_variables.yml # FROM: examples/postman_echo/request_methods/request_with_variables.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/validate_with_functions.yml # FROM: examples/postman_echo/request_methods/validate_with_functions.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
# NOTICE: Generated By HttpRunner v3.0.8 # NOTICE: Generated By HttpRunner v3.0.9
# FROM: examples/postman_echo/request_methods/validate_with_variables.yml # FROM: examples/postman_echo/request_methods/validate_with_variables.yml
from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

View File

@@ -1,4 +1,4 @@
__version__ = "3.0.8" __version__ = "3.0.9"
__description__ = "One-stop solution for HTTP(S) testing." __description__ = "One-stop solution for HTTP(S) testing."
from httprunner.runner import HttpRunner from httprunner.runner import HttpRunner

View File

@@ -1,7 +1,7 @@
from fastapi import APIRouter from fastapi import APIRouter
from httprunner.runner import HttpRunner from httprunner.runner import HttpRunner
from httprunner.schema import ProjectMeta, TestCase from httprunner.models import ProjectMeta, TestCase
router = APIRouter() router = APIRouter()
runner = HttpRunner() runner = HttpRunner()

View File

@@ -13,8 +13,8 @@ from requests.exceptions import (
) )
from sentry_sdk import capture_exception from sentry_sdk import capture_exception
from httprunner.schema import RequestData, ResponseData from httprunner.models import RequestData, ResponseData
from httprunner.schema import SessionData, ReqRespData from httprunner.models import SessionData, ReqRespData
from httprunner.utils import lower_dict_keys, omit_long_data from httprunner.utils import lower_dict_keys, omit_long_data
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

View File

@@ -49,7 +49,7 @@ from typing import Text, NoReturn
from loguru import logger from loguru import logger
from httprunner.parser import parse_variables_mapping from httprunner.parser import parse_variables_mapping
from httprunner.schema import TStep, FunctionsMapping from httprunner.models import TStep, FunctionsMapping
try: try:
import filetype import filetype

View File

@@ -13,7 +13,7 @@ from pydantic import ValidationError
from httprunner import builtin, utils from httprunner import builtin, utils
from httprunner import exceptions from httprunner import exceptions
from httprunner.schema import TestCase, ProjectMeta, TestSuite from httprunner.models import TestCase, ProjectMeta, TestSuite
try: try:
# PyYAML version >= 5.1 # PyYAML version >= 5.1

View File

@@ -6,7 +6,7 @@ from typing import Any, Set, Text, Callable, List, Dict
from sentry_sdk import capture_exception from sentry_sdk import capture_exception
from httprunner import loader, utils, exceptions from httprunner import loader, utils, exceptions
from httprunner.schema import VariablesMapping, FunctionsMapping from httprunner.models import VariablesMapping, FunctionsMapping
absolute_http_url_regexp = re.compile(r"^https?://", re.I) absolute_http_url_regexp = re.compile(r"^https?://", re.I)

View File

@@ -6,7 +6,7 @@ from loguru import logger
from httprunner.exceptions import ValidationFailure, ParamsError from httprunner.exceptions import ValidationFailure, ParamsError
from httprunner.parser import parse_data, parse_string_value, get_mapping_function from httprunner.parser import parse_data, parse_string_value, get_mapping_function
from httprunner.schema import VariablesMapping, Validators, FunctionsMapping from httprunner.models import VariablesMapping, Validators, FunctionsMapping
def get_uniform_comparator(comparator: Text): def get_uniform_comparator(comparator: Text):

View File

@@ -21,7 +21,7 @@ from httprunner.loader import load_project_meta, load_testcase_file
from httprunner.parser import build_url, parse_data, parse_variables_mapping from httprunner.parser import build_url, parse_data, parse_variables_mapping
from httprunner.response import ResponseObject from httprunner.response import ResponseObject
from httprunner.testcase import Config, Step from httprunner.testcase import Config, Step
from httprunner.schema import ( from httprunner.models import (
TConfig, TConfig,
TStep, TStep,
VariablesMapping, VariablesMapping,

View File

@@ -1,7 +1,7 @@
import inspect import inspect
from typing import Text, Any, Union, Callable from typing import Text, Any, Union, Callable
from httprunner.schema import ( from httprunner.models import (
TConfig, TConfig,
TStep, TStep,
TRequest, TRequest,

View File

@@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "httprunner" name = "httprunner"
version = "3.0.8" version = "3.0.9"
description = "One-stop solution for HTTP(S) testing." description = "One-stop solution for HTTP(S) testing."
license = "Apache-2.0" license = "Apache-2.0"
readme = "README.md" readme = "README.md"