From 63925b9c2519a70c4818a2f3dfb2989545cb5d51 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Thu, 28 May 2020 18:44:17 +0800 Subject: [PATCH] change: move all unittests to tests folder --- .github/workflows/unittest.yml | 2 +- docs/CHANGELOG.md | 1 + tests/__init__.py | 0 tests/app/__init__.py | 0 {httprunner/app/routers => tests/app}/debug_test.py | 0 {httprunner => tests}/cli_test.py | 0 {httprunner => tests}/compat_test.py | 2 +- tests/ext/__init__.py | 0 tests/ext/har2case/__init__.py | 0 {httprunner => tests}/ext/har2case/core_test.py | 2 +- {httprunner => tests}/ext/har2case/data/demo-quickstart.har | 0 {httprunner => tests}/ext/har2case/data/demo.har | 0 {httprunner => tests}/ext/har2case/utils_test.py | 0 {httprunner/ext/make => tests/ext}/make_test.py | 0 {httprunner/ext/scaffold => tests/ext}/scaffold_test.py | 0 {httprunner => tests}/loader_test.py | 0 {httprunner => tests}/parser_test.py | 0 {httprunner => tests}/runner_test.py | 0 {httprunner => tests}/utils_test.py | 0 19 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/app/__init__.py rename {httprunner/app/routers => tests/app}/debug_test.py (100%) rename {httprunner => tests}/cli_test.py (100%) rename {httprunner => tests}/compat_test.py (99%) create mode 100644 tests/ext/__init__.py create mode 100644 tests/ext/har2case/__init__.py rename {httprunner => tests}/ext/har2case/core_test.py (99%) rename {httprunner => tests}/ext/har2case/data/demo-quickstart.har (100%) rename {httprunner => tests}/ext/har2case/data/demo.har (100%) rename {httprunner => tests}/ext/har2case/utils_test.py (100%) rename {httprunner/ext/make => tests/ext}/make_test.py (100%) rename {httprunner/ext/scaffold => tests/ext}/scaffold_test.py (100%) rename {httprunner => tests}/loader_test.py (100%) rename {httprunner => tests}/parser_test.py (100%) rename {httprunner => tests}/runner_test.py (100%) rename {httprunner => tests}/utils_test.py (100%) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 851dabfc..632f342f 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -31,7 +31,7 @@ jobs: poetry run hmake poetry run hrun poetry run har2case - poetry run coverage run --source=httprunner -m pytest httprunner + poetry run coverage run --source=httprunner -m pytest tests poetry run coverage xml poetry run coverage report -m - name: Codecov diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 41c7248b..f580d12a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,7 @@ **Changed** - change: make `allure-pytest`, `requests-toolbelt`, `filetype` as optional dependencies +- change: move all unittests to tests folder ## 3.0.5 (2020-05-22) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/app/__init__.py b/tests/app/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/httprunner/app/routers/debug_test.py b/tests/app/debug_test.py similarity index 100% rename from httprunner/app/routers/debug_test.py rename to tests/app/debug_test.py diff --git a/httprunner/cli_test.py b/tests/cli_test.py similarity index 100% rename from httprunner/cli_test.py rename to tests/cli_test.py diff --git a/httprunner/compat_test.py b/tests/compat_test.py similarity index 99% rename from httprunner/compat_test.py rename to tests/compat_test.py index be41e9f5..282582d9 100644 --- a/httprunner/compat_test.py +++ b/tests/compat_test.py @@ -153,7 +153,7 @@ class TestCompat(unittest.TestCase): "--failfast", "--save-tests", "--report-file", - "report.html" + "report.html", ] self.assertEqual( compat.ensure_cli_args(args4), diff --git a/tests/ext/__init__.py b/tests/ext/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/ext/har2case/__init__.py b/tests/ext/har2case/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/httprunner/ext/har2case/core_test.py b/tests/ext/har2case/core_test.py similarity index 99% rename from httprunner/ext/har2case/core_test.py rename to tests/ext/har2case/core_test.py index 47cef5d1..329dde57 100644 --- a/httprunner/ext/har2case/core_test.py +++ b/tests/ext/har2case/core_test.py @@ -2,7 +2,7 @@ import os from httprunner.ext.har2case.core import HarParser from httprunner.ext.har2case.utils import load_har_log_entries -from httprunner.ext.har2case.utils_test import TestHar2CaseUtils +from tests.ext.har2case.utils_test import TestHar2CaseUtils class TestHar(TestHar2CaseUtils): diff --git a/httprunner/ext/har2case/data/demo-quickstart.har b/tests/ext/har2case/data/demo-quickstart.har similarity index 100% rename from httprunner/ext/har2case/data/demo-quickstart.har rename to tests/ext/har2case/data/demo-quickstart.har diff --git a/httprunner/ext/har2case/data/demo.har b/tests/ext/har2case/data/demo.har similarity index 100% rename from httprunner/ext/har2case/data/demo.har rename to tests/ext/har2case/data/demo.har diff --git a/httprunner/ext/har2case/utils_test.py b/tests/ext/har2case/utils_test.py similarity index 100% rename from httprunner/ext/har2case/utils_test.py rename to tests/ext/har2case/utils_test.py diff --git a/httprunner/ext/make/make_test.py b/tests/ext/make_test.py similarity index 100% rename from httprunner/ext/make/make_test.py rename to tests/ext/make_test.py diff --git a/httprunner/ext/scaffold/scaffold_test.py b/tests/ext/scaffold_test.py similarity index 100% rename from httprunner/ext/scaffold/scaffold_test.py rename to tests/ext/scaffold_test.py diff --git a/httprunner/loader_test.py b/tests/loader_test.py similarity index 100% rename from httprunner/loader_test.py rename to tests/loader_test.py diff --git a/httprunner/parser_test.py b/tests/parser_test.py similarity index 100% rename from httprunner/parser_test.py rename to tests/parser_test.py diff --git a/httprunner/runner_test.py b/tests/runner_test.py similarity index 100% rename from httprunner/runner_test.py rename to tests/runner_test.py diff --git a/httprunner/utils_test.py b/tests/utils_test.py similarity index 100% rename from httprunner/utils_test.py rename to tests/utils_test.py