chore: move tests to /tests

saveweb · Oct 5, 2024 · 678573f · 678573f
1 parent 4129537
commit 678573f
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 10 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,8 +40,7 @@ repository = "https://github.com/saveweb/wikiteam3"
 
 [tool.pdm]
 [tool.pdm.build]
-includes = ["wikiteam3/**/*"]
-excludes = ["wikiteam3/dumpgenerator/test/*"]
+excludes = []
 [tool.pdm.dev-dependencies]
 dev = [
     "pytest<9.0.0,>=8.2.2",

diff --git a/wikiteam3/dumpgenerator/test/__init__.py → tests/__init__.py b/wikiteam3/dumpgenerator/test/__init__.py → tests/__init__.py
diff --git a/...html_regexs/archiveteam.org-20230701.html → ...html_regexs/archiveteam.org-20230701.html b/...html_regexs/archiveteam.org-20230701.html → ...html_regexs/archiveteam.org-20230701.html
diff --git a/...ml_regexs/asoiaf.fandom.com-20230701.html → ...ml_regexs/asoiaf.fandom.com-20230701.html b/...ml_regexs/asoiaf.fandom.com-20230701.html → ...ml_regexs/asoiaf.fandom.com-20230701.html
diff --git a/...gexs/commons.moegirl.org.cn-20230701.html → ...gexs/commons.moegirl.org.cn-20230701.html b/...gexs/commons.moegirl.org.cn-20230701.html → ...gexs/commons.moegirl.org.cn-20230701.html
diff --git a/...ve-web.org_mediawiki-1.16.5-20230701.html → ...ve-web.org_mediawiki-1.16.5-20230701.html b/...ve-web.org_mediawiki-1.16.5-20230701.html → ...ve-web.org_mediawiki-1.16.5-20230701.html
diff --git a/...e-web.org_mediawiki-1.23.17-20230701.html → ...e-web.org_mediawiki-1.23.17-20230701.html b/...e-web.org_mediawiki-1.23.17-20230701.html → ...e-web.org_mediawiki-1.23.17-20230701.html
diff --git a/...ve-web.org_mediawiki-1.27.7-20230701.html → ...ve-web.org_mediawiki-1.27.7-20230701.html b/...ve-web.org_mediawiki-1.27.7-20230701.html → ...ve-web.org_mediawiki-1.27.7-20230701.html
diff --git a/...ve-web.org_mediawiki-1.39.1-20230701.html → ...ve-web.org_mediawiki-1.39.1-20230701.html b/...ve-web.org_mediawiki-1.39.1-20230701.html → ...ve-web.org_mediawiki-1.39.1-20230701.html
diff --git a/...a/html_regexs/mediawiki.org-20230701.html → ...a/html_regexs/mediawiki.org-20230701.html b/...a/html_regexs/mediawiki.org-20230701.html → ...a/html_regexs/mediawiki.org-20230701.html
diff --git a/...regexs/mediawiki.org-20240924-zh-rCN.html → ...regexs/mediawiki.org-20240924-zh-rCN.html b/...regexs/mediawiki.org-20240924-zh-rCN.html → ...regexs/mediawiki.org-20240924-zh-rCN.html
diff --git a/...a/html_regexs/mediawiki.org-20240924.html → ...a/html_regexs/mediawiki.org-20240924.html b/...a/html_regexs/mediawiki.org-20240924.html → ...a/html_regexs/mediawiki.org-20240924.html
diff --git a/...html_regexs/wiki.othing.xyz-20230701.html → ...html_regexs/wiki.othing.xyz-20230701.html b/...html_regexs/wiki.othing.xyz-20230701.html → ...html_regexs/wiki.othing.xyz-20230701.html
diff --git a/...pgenerator/dump/image/html_regexs_test.py → tests/html_regexs_test.py b/...pgenerator/dump/image/html_regexs_test.py → tests/html_regexs_test.py
@@ -1,18 +1,18 @@
 import os
+from pathlib import Path
 import re
 from urllib.parse import unquote
 from typing import Dict
 
 import requests
 import pytest
 
-from wikiteam3.dumpgenerator import DUMPER_ROOT_PATH
 from wikiteam3.dumpgenerator.dump.image.html_regexs import REGEX_CANDIDATES
 from wikiteam3.utils.util import undo_HTML_entities
 
 ONLINE = False
 
-HTML_DIR = DUMPER_ROOT_PATH  / "test/data/html_regexs"
+HTML_DIR = Path(__file__).parent / "data/html_regexs"
 os.makedirs(HTML_DIR, exist_ok=True)
 
 def prepare_raws_from_urls(urls: Dict[str, str]):

diff --git a/...dumpgenerator/dump/misc/site_info_test.py → tests/site_info_test.py b/...dumpgenerator/dump/misc/site_info_test.py → tests/site_info_test.py
@@ -3,9 +3,9 @@
 import pytest
 import requests
 
-from wikiteam3.dumpgenerator.test.test_config import get_config
+from wikiteam3.dumpgenerator.dump.misc.site_info import save_siteinfo
 
-from .site_info import save_siteinfo
+from tests.test_config import get_config
 
 def test_mediawiki_1_16():
     pytest.skip("Temporarily down")

diff --git a/wikiteam3/dumpgenerator/test/test_bad_ssl.py → tests/test_bad_ssl.py b/wikiteam3/dumpgenerator/test/test_bad_ssl.py → tests/test_bad_ssl.py
diff --git a/wikiteam3/dumpgenerator/test/test_config.py → tests/test_config.py b/wikiteam3/dumpgenerator/test/test_config.py → tests/test_config.py
@@ -23,7 +23,7 @@ def _new_config_from_parameter(params):
         pass
 
 def get_config(mediawiki_ver, api=True):
-    assert api == True
+    assert api is True
     if mediawiki_ver == '1.16.5':
         return _new_config_from_parameter([
             "--api", "http://group0.mediawiki.demo.save-web.org/mediawiki-1.16.5/api.php",

diff --git a/wikiteam3/dumpgenerator/__init__.py b/wikiteam3/dumpgenerator/__init__.py
@@ -1,7 +1,4 @@
-from pathlib import Path
 from wikiteam3.dumpgenerator.dump import DumpGenerator
 
-DUMPER_ROOT_PATH = Path(__file__).parent
-
 def main():
     DumpGenerator()