add back missing tests (#209)

Author: viseshrp

pyproject.toml

@@ -116,6 +116,7 @@ dev = [
 ]
 
 [tool.pytest.ini_options]
+tmp_path_retention_policy = "failed"
 testpaths = ["tests"]
 addopts = "--capture=tee-sys --tb=native -p no:warnings"
 markers =[

tests/conftest.py

@@ -1,8 +1,8 @@
 """Global fixtures go here."""
 
 from pathlib import Path
-from random import choice, random
-from string import ascii_letters
+from random import randint
+from uuid import uuid4
 
 import pytest
 
@@ -30,31 +30,25 @@ def adr_service_create(pytestconfig: pytest.Config) -> Service:
 
     # Paths setup
     base_dir = Path(__file__).parent / "test_data"
-    dir_name = "auto_delete_" + "".join(choice(ascii_letters) for _ in range(5))
-    db_dir = base_dir / dir_name
-    tmp_docker_dir = base_dir / "tmp_docker"
+    local_db = base_dir / f"auto_delete_{str(uuid4()).replace('-', '')}"
+    tmp_docker_dir = base_dir / "tmp_docker_create"
 
     if use_local:
         adr_service = Service(
             ansys_installation=pytestconfig.getoption("install_path"),
-            docker_image=DOCKER_DEV_REPO_URL,
-            db_directory=str(db_dir),
-            port=8000 + int(random() * 4000),
+            db_directory=str(local_db),
+            port=8000 + randint(0, 3999),
         )
     else:
         adr_service = Service(
             ansys_installation="docker",
             docker_image=DOCKER_DEV_REPO_URL,
-            db_directory=str(db_dir),
+            db_directory=str(local_db),
             data_directory=str(tmp_docker_dir),
-            port=8000 + int(random() * 4000),
+            port=8000 + randint(0, 3999),
         )
 
-    _ = adr_service.start(
-        create_db=True,
-        exit_on_close=True,
-        delete_db=True,
-    )
+    adr_service.start(create_db=True, exit_on_close=True, delete_db=True)
 
     yield adr_service  # Return to running the test session
 
@@ -72,17 +66,19 @@ def adr_service_query(pytestconfig: pytest.Config) -> Service:
     tmp_docker_dir = base_dir / "tmp_docker_query"
 
     if use_local:
-        ansys_installation = pytestconfig.getoption("install_path")
+        adr_service = Service(
+            ansys_installation=pytestconfig.getoption("install_path"),
+            db_directory=str(local_db),
+            port=8000 + randint(0, 3999),
+        )
     else:
-        ansys_installation = "docker"
-
-    adr_service = Service(
-        ansys_installation=ansys_installation,
-        docker_image=DOCKER_DEV_REPO_URL,
-        db_directory=str(local_db),
-        data_directory=str(tmp_docker_dir),
-        port=8000 + int(random() * 4000),
-    )
+        adr_service = Service(
+            ansys_installation="docker",
+            docker_image=DOCKER_DEV_REPO_URL,
+            db_directory=str(local_db),
+            data_directory=str(tmp_docker_dir),
+            port=8000 + randint(0, 3999),
+        )
 
     if not use_local:
         adr_service._container.save_config()

tests/test_download_html.py

@@ -3,7 +3,7 @@
 from ansys.dynamicreporting.core.utils import report_download_html as rd
 
 
-def test_download_use_data(request, adr_service_query) -> bool:
+def test_download_use_data(request, adr_service_query) -> None:
     test_dir = join(join(request.fspath.dirname, "test_data"), "test_html_ext")
     my_url = "http://localhost:" + str(adr_service_query._port)
     my_url += "/reports/report_display/?report_table_length=10&view=c4afe878-a4fe-11ed-a616-747827182a82&usemenus=on&dpi=96&pwidth=19.41&query="
@@ -12,7 +12,7 @@ def test_download_use_data(request, adr_service_query) -> bool:
     assert test_res
 
 
-def test_download_nourl(request, adr_service_query) -> bool:
+def test_download_nourl(request, adr_service_query) -> None:
     test_dir = join(join(request.fspath.dirname, "test_data"), "exp_test_html")
     my_url = None
     a = rd.ReportDownloadHTML(url=my_url, directory=test_dir, debug=True)
@@ -24,7 +24,7 @@ def test_download_nourl(request, adr_service_query) -> bool:
     assert success
 
 
-def test_download_nodir(request, adr_service_query) -> bool:
+def test_download_nodir(request, adr_service_query) -> None:
     my_url = "http://localhost:" + str(adr_service_query._port)
     my_url += "/reports/report_display/?report_table_length=10&view=c4afe878-a4fe-11ed-a616-747827182a82&usemenus=on&dpi=96&pwidth=19.41&query="
     a = rd.ReportDownloadHTML(url=my_url, directory=None, debug=True)
@@ -36,7 +36,7 @@ def test_download_nodir(request, adr_service_query) -> bool:
     assert success
 
 
-def test_download_sqlite(request, adr_service_query) -> bool:
+def test_download_sqlite(request, adr_service_query) -> None:
     test_dir = join(join(join(request.fspath.dirname, "test_data"), "query_db"), "db.sqlite3")
     my_url = "http://localhost:" + str(adr_service_query._port)
     my_url += "/reports/report_display/?report_table_length=10&view=c4afe878-a4fe-11ed-a616-747827182a82&usemenus=on&dpi=96&pwidth=19.41&query="
@@ -49,7 +49,7 @@ def test_download_sqlite(request, adr_service_query) -> bool:
     assert success
 
 
-def test_download(request, adr_service_query) -> bool:
+def test_download(request, adr_service_query) -> None:
     test_dir = join(join(request.fspath.dirname, "test_data"), "html_exp")
     my_url = "http://localhost:" + str(adr_service_query._port)
     my_url += "/reports/report_display/?report_table_length=10&view=c4afe878-a4fe-11ed-a616-747827182a82&usemenus=on&dpi=96&pwidth=19.41&query="

tests/test_encoders.py

@@ -9,39 +9,39 @@
 
 
 @pytest.mark.ado_test
-def test_payload() -> bool:
+def test_payload() -> None:
     b = en.PayloaddataEncoder()
     res = b.default(obj=ru.nexus_array())
     assert res == [[0.0]]
 
 
 @pytest.mark.ado_test
-def test_base_datetime() -> bool:
+def test_base_datetime() -> None:
     a = en.BaseEncoder()
     assert a.default(obj=datetime.datetime(year=2023, month=4, day=10)) == "2023-04-10T00:00:00"
 
 
 @pytest.mark.ado_test
-def test_uuid() -> bool:
+def test_uuid() -> None:
     a = en.PayloaddataEncoder()
     assert type(a.default(obj=uuid.uuid1())) is str
 
 
 @pytest.mark.ado_test
-def test_bytes() -> bool:
+def test_bytes() -> None:
     a = en.BaseEncoder()
     mystr = "aa"
     assert a.default(obj=mystr.encode()) == mystr
 
 
 @pytest.mark.ado_test
-def test_dict() -> bool:
+def test_dict() -> None:
     a = en.BaseEncoder()
     mydict = {"a": 1}
     assert a.default(obj=mydict) == mydict
 
 
 @pytest.mark.ado_test
-def test_nparray() -> bool:
+def test_nparray() -> None:
     a = en.PayloaddataEncoder()
     assert isinstance(a.default(obj=np.ndarray(shape=(1, 1))), list)

tests/test_filelock.py

@@ -19,7 +19,7 @@
 
 
 @pytest.mark.ado_test
-def test_timeout(request) -> bool:
+def test_timeout(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "time.txt")
     open(tmp_file, "a").close()
@@ -28,7 +28,7 @@ def test_timeout(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_base_acquire(request) -> bool:
+def test_base_acquire(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "base.txt")
     open(tmp_file, "a").close()
@@ -43,7 +43,7 @@ def test_base_acquire(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_base_release(request) -> bool:
+def test_base_release(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "base2.txt")
     open(tmp_file, "a").close()
@@ -58,7 +58,7 @@ def test_base_release(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_base_locked(request) -> bool:
+def test_base_locked(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "base3.txt")
     open(tmp_file, "a").close()
@@ -67,7 +67,7 @@ def test_base_locked(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_base_rel(request) -> bool:
+def test_base_rel(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "base4.txt")
     open(tmp_file, "a").close()
@@ -76,7 +76,7 @@ def test_base_rel(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_platform_lock(request) -> bool:
+def test_platform_lock(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "platform.txt")
     tmp_file2 = join(test_path, "platform2.txt")
@@ -96,7 +96,7 @@ def test_platform_lock(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_soft(request) -> bool:
+def test_soft(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "soft.txt")
     tmp_file2 = join(test_path, "soft2.txt")
@@ -108,7 +108,7 @@ def test_soft(request) -> bool:
     assert rel is None
 
 
-def test_nexus_filelock(request) -> bool:
+def test_nexus_filelock(request) -> None:
     test_path = join(request.fspath.dirname, "test_data")
     tmp_file = join(test_path, "n_lock.txt")
     try:

tests/test_geofile_processing.py

@@ -18,7 +18,7 @@ def return_file_paths(request):
 
 
 @pytest.mark.ado_test
-def test_get_evsn_proxy_image(request) -> bool:
+def test_get_evsn_proxy_image(request) -> None:
     try:
         _ = gp.get_evsn_proxy_image(filename=return_file_paths(request)[6])
         success = True
@@ -28,33 +28,33 @@ def test_get_evsn_proxy_image(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_get_evsn_proxy_error(request) -> bool:
+def test_get_evsn_proxy_error(request) -> None:
     succ = gp.get_evsn_proxy_image(filename=return_file_paths(request)[5]) is None
     assert succ
 
 
 @pytest.mark.ado_test
-def test_file_can_have_proxy(request) -> bool:
+def test_file_can_have_proxy(request) -> None:
     scene = gp.file_can_have_proxy(return_file_paths(request)[1])
     img = gp.file_can_have_proxy(return_file_paths(request)[0])
     assert scene is True and img is False
 
 
 @pytest.mark.ado_test
-def test_file_is_3d_geometry(request) -> bool:
+def test_file_is_3d_geometry(request) -> None:
     scene = gp.file_is_3d_geometry(return_file_paths(request)[1], file_item_only=False)
     img = gp.file_is_3d_geometry(return_file_paths(request)[0])
     assert scene is True and img is False
 
 
 @pytest.mark.ado_test
-def test_get_avz_directory(request) -> bool:
+def test_get_avz_directory(request) -> None:
     avz_dir = gp.get_avz_directory(return_file_paths(request)[1])
     assert isinstance(avz_dir, str) and avz_dir != ""
 
 
 @pytest.mark.ado_test
-def test_rebuild_3d_geom_avz(request) -> bool:
+def test_rebuild_3d_geom_avz(request) -> None:
     _ = gp.rebuild_3d_geometry(
         csf_file=return_file_paths(request)[1], unique_id="abc", exec_basis="avz"
     )
@@ -64,7 +64,7 @@ def test_rebuild_3d_geom_avz(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_rebuild_3d_geom_ens(request) -> bool:
+def test_rebuild_3d_geom_ens(request) -> None:
     _ = gp.rebuild_3d_geometry(
         csf_file=return_file_paths(request)[2], unique_id="abc", exec_basis="avz"
     )
@@ -74,7 +74,7 @@ def test_rebuild_3d_geom_ens(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_rebuild_3d_geom_evsn(request) -> bool:
+def test_rebuild_3d_geom_evsn(request) -> None:
     _ = gp.rebuild_3d_geometry(
         csf_file=return_file_paths(request)[3], unique_id="abc", exec_basis="avz"
     )
@@ -84,7 +84,7 @@ def test_rebuild_3d_geom_evsn(request) -> bool:
 
 
 @pytest.mark.ado_test
-def test_rebuild_3d_geom_scdoc(request) -> bool:
+def test_rebuild_3d_geom_scdoc(request) -> None:
     _ = gp.rebuild_3d_geometry(
         csf_file=return_file_paths(request)[4], unique_id="abc", exec_basis="avz"
     )
@@ -93,7 +93,7 @@ def test_rebuild_3d_geom_scdoc(request) -> bool:
     assert isdir(new_dir)
 
 
-def test_rebuild_3d_geom_scdoc_second(request) -> bool:
+def test_rebuild_3d_geom_scdoc_second(request) -> None:
     _ = gp.rebuild_3d_geometry(
         csf_file=return_file_paths(request)[4], unique_id="abc", exec_basis="avz"
     )
@@ -102,7 +102,7 @@ def test_rebuild_3d_geom_scdoc_second(request) -> bool:
     assert isdir(new_dir)
 
 
-def test_rebuild_3d_geom_csf(request, get_exec) -> bool:
+def test_rebuild_3d_geom_csf(request, get_exec) -> None:
     exec_basis = get_exec
     if exec_basis:
         _ = gp.rebuild_3d_geometry(

tests/test_hacks.py

@@ -7,32 +7,32 @@
 
 
 @pytest.mark.ado_test
-def test_unpicke() -> bool:
+def test_unpicke() -> None:
     assert ex.safe_unpickle(input_data="!@P{}", item_type="tree") == "!@P{}"
 
 
 @pytest.mark.ado_test
-def test_unpickle_empty() -> bool:
+def test_unpickle_empty() -> None:
     assert ex.safe_unpickle(input_data="") == ""
 
 
 @pytest.mark.ado_test
-def test_unpickle_bytes() -> bool:
+def test_unpickle_bytes() -> None:
     assert ex.safe_unpickle(input_data=pickle.dumps("!@P{}")) == "!@P{}"
 
 
 @pytest.mark.ado_test
-def test_unpickle_none() -> bool:
+def test_unpickle_none() -> None:
     assert ex.safe_unpickle(input_data=None) is None
 
 
 @pytest.mark.ado_test
-def test_unpickle_nobeg() -> bool:
+def test_unpickle_nobeg() -> None:
     assert ex.safe_unpickle(input_data=pickle.dumps("abcde")) == "abcde"
 
 
 @pytest.mark.ado_test
-def test_unpickle_error() -> bool:
+def test_unpickle_error() -> None:
     success = False
     try:
         ex.safe_unpickle(input_data="abcde")
@@ -42,14 +42,14 @@ def test_unpickle_error() -> bool:
 
 
 @pytest.mark.ado_test
-def test_rec_tree() -> bool:
+def test_rec_tree() -> None:
     test = ex.reconstruct_tree_item(
         [{b"a": 1}, {1: b"b"}, {1: uuid.uuid1()}, {1: [{"a": "b"}, {}]}]
     )
     assert len(test) == 4
 
 
 @pytest.mark.ado_test
-def test_rec_int_data() -> bool:
+def test_rec_int_data() -> None:
     test = ex.reconstruct_international_text(data={"a": [1, 2, 3], "b": 2})
     assert test == {"a": [1, 2, 3], "b": 2}