refactor: move tests folder into src to fix font and path issues

meramsey · Apr 16, 2022 · 23c9d66 · 23c9d66
1 parent 5671fbc
commit 23c9d66
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 10 deletions.
diff --git a/config/pytest.ini b/config/pytest.ini
@@ -12,6 +12,6 @@ python_files =
 addopts =
   --cov
   --cov-config config/coverage.ini
-  --ignore=tests/test_app.py
+  --ignore=src/tests/test_app.py
 testpaths =
-  tests
+  src/tests
diff --git a/duties.py b/duties.py
@@ -13,7 +13,7 @@
 from git_changelog.build import Changelog, Version
 from jinja2.sandbox import SandboxedEnvironment
 
-PY_SRC_PATHS = (Path(_) for _ in ("src", "tests", "duties.py", "docs/macros.py"))
+PY_SRC_PATHS = (Path(_) for _ in ("src", "duties.py", "docs/macros.py"))
 PY_SRC_LIST = tuple(str(_) for _ in PY_SRC_PATHS)
 PY_SRC = " ".join(PY_SRC_LIST)
 TESTING = os.environ.get("TESTING", "0") in {"1", "true"}
@@ -351,7 +351,7 @@ def test(ctx, match: str = ""):
     py_version = f"{sys.version_info.major}{sys.version_info.minor}"
     os.environ["COVERAGE_FILE"] = f".coverage-{py_version}"
     ctx.run(
-        ["pytest", "-c", "config/pytest.ini", "-n", "auto", "-k", match, "tests"],
+        ["pytest", "-c", "config/pytest.ini", "-n", "auto", "-k", match, "src/tests"],
         title="Running tests",
         pty=PTY,
     )
diff --git a/tests/__init__.py → src/tests/__init__.py b/tests/__init__.py → src/tests/__init__.py
diff --git a/tests/conftest.py → src/tests/conftest.py b/tests/conftest.py → src/tests/conftest.py
diff --git a/tests/data/cert.crt → src/tests/data/cert.crt b/tests/data/cert.crt → src/tests/data/cert.crt
diff --git a/tests/data/cert.key → src/tests/data/cert.key b/tests/data/cert.key → src/tests/data/cert.key
diff --git a/tests/data/fonts/.gitignore → src/tests/data/fonts/.gitignore b/tests/data/fonts/.gitignore → src/tests/data/fonts/.gitignore
diff --git a/tests/data/fonts/fake-font → src/tests/data/fonts/fake-font b/tests/data/fonts/fake-font → src/tests/data/fonts/fake-font
diff --git a/tests/data/known_hosts_example → src/tests/data/known_hosts_example b/tests/data/known_hosts_example → src/tests/data/known_hosts_example
diff --git a/tests/data/known_hosts_example2 → src/tests/data/known_hosts_example2 b/tests/data/known_hosts_example2 → src/tests/data/known_hosts_example2
diff --git a/tests/data/known_hosts_example3 → src/tests/data/known_hosts_example3 b/tests/data/known_hosts_example3 → src/tests/data/known_hosts_example3
diff --git a/tests/data/test_ed25519.key → src/tests/data/test_ed25519.key b/tests/data/test_ed25519.key → src/tests/data/test_ed25519.key
diff --git a/tests/data/test_ed25519_password.key → src/tests/data/test_ed25519_password.key b/tests/data/test_ed25519_password.key → src/tests/data/test_ed25519_password.key
diff --git a/tests/data/test_known_hosts → src/tests/data/test_known_hosts b/tests/data/test_known_hosts → src/tests/data/test_known_hosts
diff --git a/tests/data/test_new_dsa.key → src/tests/data/test_new_dsa.key b/tests/data/test_new_dsa.key → src/tests/data/test_new_dsa.key
diff --git a/tests/data/test_new_rsa_password.key → src/tests/data/test_new_rsa_password.key b/tests/data/test_new_rsa_password.key → src/tests/data/test_new_rsa_password.key
diff --git a/tests/data/test_rsa.key → src/tests/data/test_rsa.key b/tests/data/test_rsa.key → src/tests/data/test_rsa.key
diff --git a/tests/data/test_rsa_password.key → src/tests/data/test_rsa_password.key b/tests/data/test_rsa_password.key → src/tests/data/test_rsa_password.key
diff --git a/tests/data/user_rsa_key → src/tests/data/user_rsa_key b/tests/data/user_rsa_key → src/tests/data/user_rsa_key
diff --git a/tests/sshserver.py → src/tests/sshserver.py b/tests/sshserver.py → src/tests/sshserver.py
diff --git a/tests/test_app.py → src/tests/test_app.py b/tests/test_app.py → src/tests/test_app.py
diff --git a/tests/test_cli.py → src/tests/test_cli.py b/tests/test_cli.py → src/tests/test_cli.py
diff --git a/tests/test_handler.py → src/tests/test_handler.py b/tests/test_handler.py → src/tests/test_handler.py
diff --git a/tests/test_main.py → src/tests/test_main.py b/tests/test_main.py → src/tests/test_main.py
diff --git a/tests/test_policy.py → src/tests/test_policy.py b/tests/test_policy.py → src/tests/test_policy.py
diff --git a/tests/test_settings.py → src/tests/test_settings.py b/tests/test_settings.py → src/tests/test_settings.py
@@ -23,6 +23,8 @@
 )
 from wizardwebssh.utils import UnicodeType
 
+# base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
 
 class TestSettings(unittest.TestCase):
     def test_print_version(self):

diff --git a/tests/test_utils.py → src/tests/test_utils.py b/tests/test_utils.py → src/tests/test_utils.py
@@ -13,7 +13,7 @@
 )
 
 
-class TestUitls(unittest.TestCase):
+class TestUtils(unittest.TestCase):
     def test_to_str(self):
         b = b"hello"
         u = "hello"

diff --git a/tests/utils.py → src/tests/utils.py b/tests/utils.py → src/tests/utils.py
diff --git a/src/wizardwebssh/settings.py b/src/wizardwebssh/settings.py
@@ -59,8 +59,8 @@ def print_version(flag):
 )
 define("version", type=bool, help="Show version information", callback=print_version)
 
-# base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-base_dir = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# base_dir = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 # print(f'base_dir: {base_dir}')
 font_dirs = ["wizardwebssh", "static", "css", "fonts"]
 max_body_size = 1 * 1024 * 1024
@@ -80,12 +80,12 @@ def get_url(self, filename, dirs):
 
 def get_app_settings(options):
     settings = dict(
-        template_path=os.path.join(base_dir, "src", "wizardwebssh", "templates"),
-        static_path=os.path.join(base_dir, "src", "wizardwebssh", "static"),
+        template_path=os.path.join(base_dir, "wizardwebssh", "templates"),
+        static_path=os.path.join(base_dir, "wizardwebssh", "static"),
         websocket_ping_interval=options.wpintvl,
         debug=options.debug,
         xsrf_cookies=options.xsrf,
-        font=Font(get_font_filename(options.font, os.path.join(base_dir, "src", *font_dirs)), font_dirs[1:]),
+        font=Font(get_font_filename(options.font, os.path.join(base_dir, *font_dirs)), font_dirs[1:]),
         origin_policy=get_origin_setting(options),
     )
     # print(f'Settings: {settings}')