From bae0bda815819b9db28d0116ea71c684de661a62 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sat, 7 Mar 2020 23:17:11 +0800 Subject: [PATCH] test: move loader unittest aside source code --- .../test_cases.py => httprunner/loader/buildup_test.py | 10 ++++++++-- .../test_check.py => httprunner/loader/check_test.py | 0 .../test_load.py => httprunner/loader/load_test.py | 0 .../test_locate.py => httprunner/loader/locate_test.py | 0 tests/test_loader/__init__.py | 0 5 files changed, 8 insertions(+), 2 deletions(-) rename tests/test_loader/test_cases.py => httprunner/loader/buildup_test.py (98%) rename tests/test_loader/test_check.py => httprunner/loader/check_test.py (100%) rename tests/test_loader/test_load.py => httprunner/loader/load_test.py (100%) rename tests/test_loader/test_locate.py => httprunner/loader/locate_test.py (100%) delete mode 100644 tests/test_loader/__init__.py diff --git a/tests/test_loader/test_cases.py b/httprunner/loader/buildup_test.py similarity index 98% rename from tests/test_loader/test_cases.py rename to httprunner/loader/buildup_test.py index 5a4dcea1..1d1b78e8 100644 --- a/tests/test_loader/test_cases.py +++ b/httprunner/loader/buildup_test.py @@ -281,5 +281,11 @@ class TestSuiteLoader(unittest.TestCase): buildup.load_project_data(os.path.join(os.getcwd(), "tests")) self.assertIn("gen_md5", self.project_mapping["functions"]) self.assertEqual(self.project_mapping["env"]["PROJECT_KEY"], "ABCDEFGH") - self.assertEqual(self.project_mapping["PWD"], os.path.abspath(os.path.dirname(os.path.dirname(__file__)))) - self.assertEqual(self.project_mapping["test_path"], os.path.abspath(os.path.dirname(os.path.dirname(__file__)))) + self.assertEqual( + os.path.basename(self.project_mapping["PWD"]), + "tests" + ) + self.assertEqual( + os.path.basename(self.project_mapping["test_path"]), + "tests" + ) diff --git a/tests/test_loader/test_check.py b/httprunner/loader/check_test.py similarity index 100% rename from tests/test_loader/test_check.py rename to httprunner/loader/check_test.py diff --git a/tests/test_loader/test_load.py b/httprunner/loader/load_test.py similarity index 100% rename from tests/test_loader/test_load.py rename to httprunner/loader/load_test.py diff --git a/tests/test_loader/test_locate.py b/httprunner/loader/locate_test.py similarity index 100% rename from tests/test_loader/test_locate.py rename to httprunner/loader/locate_test.py diff --git a/tests/test_loader/__init__.py b/tests/test_loader/__init__.py deleted file mode 100644 index e69de29b..00000000