From f81ff6066b205523e4b5f51fc6730cad98767b8c Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 7 Jun 2020 11:10:12 +0800 Subject: [PATCH] test: update tests --- examples/postman-echo/debugtalk.py | 13 ---- .../__init__.py | 0 examples/postman_echo/conftest.py | 64 ------------------- .../cookie_manipulation/hardcode.yml | 0 .../set_delete_cookies.yml | 0 .../request_methods}/conftest.py | 0 .../request_methods}/demo_testsuite.yml | 4 +- .../request_with_functions_test.py | 2 +- .../request_with_testcase_reference_test.py | 2 +- .../request_methods}/hardcode.yml | 0 .../request_methods/hardcode_test.py | 2 +- .../request_with_functions.yml | 0 .../request_with_functions_test.py | 2 +- .../request_with_testcase_reference.yml | 2 +- .../request_with_testcase_reference_test.py | 2 +- .../request_with_variables.yml | 0 .../request_with_variables_test.py | 2 +- .../validate_with_functions.yml | 0 .../validate_with_functions_test.py | 2 +- .../validate_with_variables.yml | 0 .../validate_with_variables_test.py | 2 +- tests/compat_test.py | 16 ++--- tests/loader_test.py | 2 +- tests/make_test.py | 12 ++-- tests/runner_test.py | 4 +- tests/utils_test.py | 28 ++++---- 26 files changed, 39 insertions(+), 122 deletions(-) delete mode 100644 examples/postman-echo/debugtalk.py rename examples/{postman-echo => postman_echo}/__init__.py (100%) delete mode 100644 examples/postman_echo/conftest.py rename examples/{postman-echo => postman_echo}/cookie_manipulation/hardcode.yml (100%) rename examples/{postman-echo => postman_echo}/cookie_manipulation/set_delete_cookies.yml (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/conftest.py (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/demo_testsuite.yml (67%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/hardcode.yml (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/request_with_functions.yml (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/request_with_testcase_reference.yml (92%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/request_with_variables.yml (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/validate_with_functions.yml (100%) rename examples/{postman-echo/request.methods => postman_echo/request_methods}/validate_with_variables.yml (100%) diff --git a/examples/postman-echo/debugtalk.py b/examples/postman-echo/debugtalk.py deleted file mode 100644 index af8b22eb..00000000 --- a/examples/postman-echo/debugtalk.py +++ /dev/null @@ -1,13 +0,0 @@ -from httprunner import __version__ - - -def get_httprunner_version(): - return __version__ - - -def sum_two(m, n): - return m + n - - -def get_variables(): - return {"foo1": "session_bar1"} diff --git a/examples/postman-echo/__init__.py b/examples/postman_echo/__init__.py similarity index 100% rename from examples/postman-echo/__init__.py rename to examples/postman_echo/__init__.py diff --git a/examples/postman_echo/conftest.py b/examples/postman_echo/conftest.py deleted file mode 100644 index b16b9c1e..00000000 --- a/examples/postman_echo/conftest.py +++ /dev/null @@ -1,64 +0,0 @@ -# NOTICE: Generated By HttpRunner. -import json -import os -import time - -import pytest -from loguru import logger - -from httprunner.utils import get_platform - - -@pytest.fixture(scope="session", autouse=True) -def session_fixture(request): - """setup and teardown each task""" - logger.info(f"start running testcases ...") - - start_at = time.time() - - yield - - logger.info(f"task finished, generate task summary for --save-tests") - - summary = { - "success": True, - "stat": { - "testcases": {"total": 0, "success": 0, "fail": 0}, - "teststeps": {"total": 0, "failures": 0, "successes": 0}, - }, - "time": {"start_at": start_at, "duration": time.time() - start_at}, - "platform": get_platform(), - "details": [], - } - - for item in request.node.items: - testcase_summary = item.instance.get_summary() - summary["success"] &= testcase_summary.success - - summary["stat"]["testcases"]["total"] += 1 - summary["stat"]["teststeps"]["total"] += len(testcase_summary.step_datas) - if testcase_summary.success: - summary["stat"]["testcases"]["success"] += 1 - summary["stat"]["teststeps"]["successes"] += len( - testcase_summary.step_datas - ) - else: - summary["stat"]["testcases"]["fail"] += 1 - summary["stat"]["teststeps"]["successes"] += ( - len(testcase_summary.step_datas) - 1 - ) - summary["stat"]["teststeps"]["failures"] += 1 - - testcase_summary_json = testcase_summary.dict() - testcase_summary_json["records"] = testcase_summary_json.pop("step_datas") - summary["details"].append(testcase_summary_json) - - summary_path = "/Users/debugtalk/MyProjects/HttpRunner-dev/HttpRunner/examples/postman_echo/logs/request.methods/hardcode.summary.json" - summary_dir = os.path.dirname(summary_path) - os.makedirs(summary_dir, exist_ok=True) - - with open(summary_path, "w", encoding="utf-8") as f: - json.dump(summary, f, indent=4) - - logger.info(f"generated task summary: {summary_path}") - diff --git a/examples/postman-echo/cookie_manipulation/hardcode.yml b/examples/postman_echo/cookie_manipulation/hardcode.yml similarity index 100% rename from examples/postman-echo/cookie_manipulation/hardcode.yml rename to examples/postman_echo/cookie_manipulation/hardcode.yml diff --git a/examples/postman-echo/cookie_manipulation/set_delete_cookies.yml b/examples/postman_echo/cookie_manipulation/set_delete_cookies.yml similarity index 100% rename from examples/postman-echo/cookie_manipulation/set_delete_cookies.yml rename to examples/postman_echo/cookie_manipulation/set_delete_cookies.yml diff --git a/examples/postman-echo/request.methods/conftest.py b/examples/postman_echo/request_methods/conftest.py similarity index 100% rename from examples/postman-echo/request.methods/conftest.py rename to examples/postman_echo/request_methods/conftest.py diff --git a/examples/postman-echo/request.methods/demo_testsuite.yml b/examples/postman_echo/request_methods/demo_testsuite.yml similarity index 67% rename from examples/postman-echo/request.methods/demo_testsuite.yml rename to examples/postman_echo/request_methods/demo_testsuite.yml index d30490fc..946d37d7 100644 --- a/examples/postman-echo/request.methods/demo_testsuite.yml +++ b/examples/postman_echo/request_methods/demo_testsuite.yml @@ -5,11 +5,11 @@ config: testcases: - name: request with functions - testcase: request.methods/request_with_functions.yml + testcase: request_methods/request_with_functions.yml variables: var1: testsuite_val1 - name: request with referenced testcase - testcase: request.methods/request_with_testcase_reference.yml + testcase: request_methods/request_with_testcase_reference.yml variables: var2: testsuite_val2 diff --git a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py index f4cb1e6b..474e99c2 100644 --- a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py index d968ae68..35a113d2 100644 --- a/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py @@ -1,5 +1,5 @@ # 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 sys diff --git a/examples/postman-echo/request.methods/hardcode.yml b/examples/postman_echo/request_methods/hardcode.yml similarity index 100% rename from examples/postman-echo/request.methods/hardcode.yml rename to examples/postman_echo/request_methods/hardcode.yml diff --git a/examples/postman_echo/request_methods/hardcode_test.py b/examples/postman_echo/request_methods/hardcode_test.py index d296aac3..a499659b 100644 --- a/examples/postman_echo/request_methods/hardcode_test.py +++ b/examples/postman_echo/request_methods/hardcode_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/examples/postman-echo/request.methods/request_with_functions.yml b/examples/postman_echo/request_methods/request_with_functions.yml similarity index 100% rename from examples/postman-echo/request.methods/request_with_functions.yml rename to examples/postman_echo/request_methods/request_with_functions.yml diff --git a/examples/postman_echo/request_methods/request_with_functions_test.py b/examples/postman_echo/request_methods/request_with_functions_test.py index 2ba75345..340749f5 100644 --- a/examples/postman_echo/request_methods/request_with_functions_test.py +++ b/examples/postman_echo/request_methods/request_with_functions_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/examples/postman-echo/request.methods/request_with_testcase_reference.yml b/examples/postman_echo/request_methods/request_with_testcase_reference.yml similarity index 92% rename from examples/postman-echo/request.methods/request_with_testcase_reference.yml rename to examples/postman_echo/request_methods/request_with_testcase_reference.yml index c66dd56d..37871f2c 100644 --- a/examples/postman-echo/request.methods/request_with_testcase_reference.yml +++ b/examples/postman_echo/request_methods/request_with_testcase_reference.yml @@ -10,7 +10,7 @@ teststeps: name: request with functions variables: foo1: override_bar1 - testcase: request.methods/request_with_functions.yml + testcase: request_methods/request_with_functions.yml export: - session_foo2 - diff --git a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py index 8c5b4b8e..75c211ff 100644 --- a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py @@ -1,5 +1,5 @@ # 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 sys diff --git a/examples/postman-echo/request.methods/request_with_variables.yml b/examples/postman_echo/request_methods/request_with_variables.yml similarity index 100% rename from examples/postman-echo/request.methods/request_with_variables.yml rename to examples/postman_echo/request_methods/request_with_variables.yml diff --git a/examples/postman_echo/request_methods/request_with_variables_test.py b/examples/postman_echo/request_methods/request_with_variables_test.py index f2f6ca44..47eff628 100644 --- a/examples/postman_echo/request_methods/request_with_variables_test.py +++ b/examples/postman_echo/request_methods/request_with_variables_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/examples/postman-echo/request.methods/validate_with_functions.yml b/examples/postman_echo/request_methods/validate_with_functions.yml similarity index 100% rename from examples/postman-echo/request.methods/validate_with_functions.yml rename to examples/postman_echo/request_methods/validate_with_functions.yml diff --git a/examples/postman_echo/request_methods/validate_with_functions_test.py b/examples/postman_echo/request_methods/validate_with_functions_test.py index e2c049fd..b077ebc8 100644 --- a/examples/postman_echo/request_methods/validate_with_functions_test.py +++ b/examples/postman_echo/request_methods/validate_with_functions_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/examples/postman-echo/request.methods/validate_with_variables.yml b/examples/postman_echo/request_methods/validate_with_variables.yml similarity index 100% rename from examples/postman-echo/request.methods/validate_with_variables.yml rename to examples/postman_echo/request_methods/validate_with_variables.yml diff --git a/examples/postman_echo/request_methods/validate_with_variables_test.py b/examples/postman_echo/request_methods/validate_with_variables_test.py index 72bd3aff..c333f462 100644 --- a/examples/postman_echo/request_methods/validate_with_variables_test.py +++ b/examples/postman_echo/request_methods/validate_with_variables_test.py @@ -1,5 +1,5 @@ # 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 diff --git a/tests/compat_test.py b/tests/compat_test.py index 53a71baa..89707db7 100644 --- a/tests/compat_test.py +++ b/tests/compat_test.py @@ -142,28 +142,28 @@ class TestCompat(unittest.TestCase): ) def test_ensure_cli_args(self): - args1 = ["examples/postman-echo/request.methods/hardcode.yml", "--failfast"] + args1 = ["examples/postman_echo/request_methods/hardcode.yml", "--failfast"] self.assertEqual( compat.ensure_cli_args(args1), - ["examples/postman-echo/request.methods/hardcode.yml"], + ["examples/postman_echo/request_methods/hardcode.yml"], ) - args2 = ["examples/postman-echo/request.methods/hardcode.yml", "--save-tests"] + args2 = ["examples/postman_echo/request_methods/hardcode.yml", "--save-tests"] self.assertEqual( compat.ensure_cli_args(args2), - ["examples/postman-echo/request.methods/hardcode.yml"], + ["examples/postman_echo/request_methods/hardcode.yml"], ) self.assertTrue(os.path.isfile("examples/postman_echo/conftest.py")) args3 = [ - "examples/postman-echo/request.methods/hardcode.yml", + "examples/postman_echo/request_methods/hardcode.yml", "--report-file", "report.html", ] self.assertEqual( compat.ensure_cli_args(args3), [ - "examples/postman-echo/request.methods/hardcode.yml", + "examples/postman_echo/request_methods/hardcode.yml", "--html", "report.html", "--self-contained-html", @@ -171,7 +171,7 @@ class TestCompat(unittest.TestCase): ) args4 = [ - "examples/postman-echo/request.methods/hardcode.yml", + "examples/postman_echo/request_methods/hardcode.yml", "--failfast", "--save-tests", "--report-file", @@ -180,7 +180,7 @@ class TestCompat(unittest.TestCase): self.assertEqual( compat.ensure_cli_args(args4), [ - "examples/postman-echo/request.methods/hardcode.yml", + "examples/postman_echo/request_methods/hardcode.yml", "--html", "report.html", "--self-contained-html", diff --git a/tests/loader_test.py b/tests/loader_test.py index 27e216ec..c5e2ab36 100644 --- a/tests/loader_test.py +++ b/tests/loader_test.py @@ -6,7 +6,7 @@ from httprunner import exceptions, loader class TestLoader(unittest.TestCase): def test_load_testcase_file(self): - path = "examples/postman-echo/request.methods/request_with_variables.yml" + path = "examples/postman_echo/request_methods/request_with_variables.yml" testcase_obj = loader.load_testcase_file(path) self.assertEqual( testcase_obj.config.name, "request methods testcase with variables" diff --git a/tests/make_test.py b/tests/make_test.py index 33de21d9..12d8943d 100644 --- a/tests/make_test.py +++ b/tests/make_test.py @@ -19,7 +19,7 @@ class TestMake(unittest.TestCase): loader.project_meta = None def test_make_testcase(self): - path = ["examples/postman-echo/request.methods/request_with_variables.yml"] + path = ["examples/postman_echo/request_methods/request_with_variables.yml"] testcase_python_list = main_make(path) self.assertEqual( testcase_python_list[0], @@ -31,7 +31,7 @@ class TestMake(unittest.TestCase): def test_make_testcase_with_ref(self): path = [ - "examples/postman-echo/request.methods/request_with_testcase_reference.yml" + "examples/postman_echo/request_methods/request_with_testcase_reference.yml" ] testcase_python_list = main_make(path) self.assertEqual(len(testcase_python_list), 1) @@ -60,7 +60,7 @@ from examples.postman_echo.request_methods.request_with_functions_test import ( ) def test_make_testcase_folder(self): - path = ["examples/postman-echo/request.methods/"] + path = ["examples/postman_echo/request_methods/"] testcase_python_list = main_make(path) self.assertIn( os.path.join( @@ -93,7 +93,7 @@ from examples.postman_echo.request_methods.request_with_functions_test import ( ) def test_make_testsuite(self): - path = ["examples/postman-echo/request.methods/demo_testsuite.yml"] + path = ["examples/postman_echo/request_methods/demo_testsuite.yml"] testcase_python_list = main_make(path) self.assertEqual(len(testcase_python_list), 2) self.assertIn( @@ -115,13 +115,13 @@ from examples.postman_echo.request_methods.request_with_functions_test import ( config = { "name": "request methods testcase: validate with functions", "variables": {"foo1": "bar1", "foo2": 22}, - "base_url": "https://postman-echo.com", + "base_url": "https://postman_echo.com", "verify": False, "path": "examples/postman_echo/request_methods/validate_with_functions_test.py", } self.assertEqual( make_config_chain_style(config), - """Config("request methods testcase: validate with functions").variables(**{'foo1': 'bar1', 'foo2': 22}).base_url("https://postman-echo.com").verify(False)""", + """Config("request methods testcase: validate with functions").variables(**{'foo1': 'bar1', 'foo2': 22}).base_url("https://postman_echo.com").verify(False)""", ) def test_make_teststep_chain_style(self): diff --git a/tests/runner_test.py b/tests/runner_test.py index a63c0694..7c664dde 100644 --- a/tests/runner_test.py +++ b/tests/runner_test.py @@ -11,7 +11,7 @@ class TestHttpRunner(unittest.TestCase): def test_run_testcase_by_path_request_only(self): self.runner.run_path( - "examples/postman-echo/request.methods/request_with_functions.yml" + "examples/postman_echo/request_methods/request_with_functions.yml" ) result = self.runner.get_summary() self.assertTrue(result.success) @@ -21,7 +21,7 @@ class TestHttpRunner(unittest.TestCase): def test_run_testcase_by_path_ref_testcase(self): self.runner.run_path( - "examples/postman-echo/request.methods/request_with_testcase_reference.yml" + "examples/postman_echo/request_methods/request_with_testcase_reference.yml" ) result = self.runner.get_summary() self.assertTrue(result.success) diff --git a/tests/utils_test.py b/tests/utils_test.py index 41514092..2a01c08a 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -102,24 +102,10 @@ class TestUtils(unittest.TestCase): def test_ensure_file_path_valid(self): self.assertEqual( ensure_file_path_valid( - "examples/postman-echo/request.methods/hardcode.yml" + "examples/a-b.c/d f/hardcode.yml" ), os.path.join( - os.getcwd(), "examples/postman_echo/request_methods/hardcode.yml" - ), - ) - self.assertEqual( - ensure_file_path_valid( - os.path.join(os.getcwd(), "postman-echo/request.methods/hardcode.yml") - ), - os.path.join(os.getcwd(), "postman_echo/request_methods/hardcode.yml"), - ) - self.assertEqual( - ensure_file_path_valid( - "examples/postman echo/request methods/hardcode.yml" - ), - os.path.join( - os.getcwd(), "examples/postman_echo/request_methods/hardcode.yml" + os.getcwd(), "examples/a_b_c/d_f/hardcode.yml" ), ) self.assertEqual( @@ -127,6 +113,14 @@ class TestUtils(unittest.TestCase): os.path.join(os.getcwd(), "T1/T2B/T3.yml"), ) self.assertEqual( - ensure_file_path_valid("examples/postman-echo/request.methods/"), + ensure_file_path_valid( + "examples/a-b.c/2B/hardcode.yml" + ), + os.path.join( + os.getcwd(), "examples/a_b_c/T2B/hardcode.yml" + ), + ) + self.assertEqual( + ensure_file_path_valid("examples/postman_echo/request_methods/"), os.path.join(os.getcwd(), "examples/postman_echo/request_methods"), )