From bf2ec777656599a1fd9d752ecda216e317d98c81 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Thu, 9 Apr 2020 22:23:19 +0800 Subject: [PATCH] fix: unittests --- httprunner/schema/common.py | 4 ++-- tests/data/demo_testcase_cli.yml | 4 ++-- tests/data/demo_testcase_functions.yml | 2 +- tests/data/demo_testcase_layer.yml | 2 +- tests/data/demo_testcase_variables.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/httprunner/schema/common.py b/httprunner/schema/common.py index bc97e9ff..40dcbb09 100644 --- a/httprunner/schema/common.py +++ b/httprunner/schema/common.py @@ -1,11 +1,11 @@ from enum import Enum -from typing import Dict, List, Any, Text +from typing import Dict, List, Any, Text, Union from pydantic import BaseModel, HttpUrl, Field Name = Text Url = Text -BaseUrl = HttpUrl +BaseUrl = Union[HttpUrl, Text] Variables = Dict[Text, Any] Headers = Dict[Text, Text] Verify = bool diff --git a/tests/data/demo_testcase_cli.yml b/tests/data/demo_testcase_cli.yml index 5e092a3f..6989e528 100644 --- a/tests/data/demo_testcase_cli.yml +++ b/tests/data/demo_testcase_cli.yml @@ -19,7 +19,7 @@ teststeps: expect_status_code: 200 token_len: 16 extract: - - token: content.token + token: content.token validate: - {"check": "status_code", "comparator": "eq", "expect": 200} - eq: ["status_code", $expect_status_code] @@ -42,7 +42,7 @@ teststeps: name: "user1" password: "123456" extract: - - success: content.success + success: content.success validate: - eq: ["status_code", 201] - sum_status_code: ["status_code", 3] diff --git a/tests/data/demo_testcase_functions.yml b/tests/data/demo_testcase_functions.yml index 759d8e02..b3653434 100644 --- a/tests/data/demo_testcase_functions.yml +++ b/tests/data/demo_testcase_functions.yml @@ -21,7 +21,7 @@ teststeps: json: sign: ${get_sign($device_sn, $os_platform, $app_version)} extract: - - token: content.token + token: content.token validate: - {"check": "status_code", "comparator": "eq", "expect": 200} - {"check": "content.token", "comparator": "len_eq", "expect": 16} diff --git a/tests/data/demo_testcase_layer.yml b/tests/data/demo_testcase_layer.yml index bfcaba16..8b53a074 100644 --- a/tests/data/demo_testcase_layer.yml +++ b/tests/data/demo_testcase_layer.yml @@ -14,7 +14,7 @@ teststeps: name: get token with $user_agent, $app_version api: api/get_token.yml extract: - - token: content.token + token: content.token validate: - "eq": ["status_code", 200] - "len_eq": ["content.token", 16] diff --git a/tests/data/demo_testcase_variables.yml b/tests/data/demo_testcase_variables.yml index 84c7a0f8..447d9717 100644 --- a/tests/data/demo_testcase_variables.yml +++ b/tests/data/demo_testcase_variables.yml @@ -24,7 +24,7 @@ teststeps: json: sign: $sign extract: - - token: content.token + token: content.token validate: - {"check": "status_code", "comparator": "eq", "expect": 200} - {"check": "content.token", "comparator": "len_eq", "expect": 16}