Merge pull request #37 from AUTODIAL/tests/pytest

Update CI workflows to use `pytest`
AUTODIAL · Oct 10, 2023 · 4e26fe3 · 4e26fe3
2 parents 931ee67 + a0929d7
commit 4e26fe3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -42,9 +42,4 @@ jobs:
             python -m autoeis install
       - name: "Run tests"
         run: |
-          # Test package is importable
-          python -c 'import autoeis as ae; print("From Python!")'
-          # Test Julia is accessible
-          python -c 'import autoeis as ae; Main = ae.julia_helpers.init_julia(); Main.println("From Julia!")'
-          # Test Julia backend is importable
-          python -c 'import autoeis as ae; ec = ae.julia_helpers.import_backend(); print(ec)'
+          pytest .
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,9 +38,4 @@ jobs:
             python -m autoeis install
       - name: "Run tests"
         run: |
-          # Test package is importable
-          python -c 'import autoeis as ae; print("From Python!")'
-          # Test Julia is accessible
-          python -c 'import autoeis as ae; Main = ae.julia_helpers.init_julia(); Main.println("From Julia!")'
-          # Test Julia backend is importable
-          python -c 'import autoeis as ae; ec = ae.julia_helpers.import_backend(); print(ec)'
+          pytest .
diff --git a/tests/test_backend.py b/tests/test_backend.py
@@ -12,8 +12,10 @@ def test_import_julia_modules():
     Main = julia_helpers.init_julia()
 
     # Ensure installed modules can be imported
-    julia_helpers.import_package(Main, "EquivalentCircuits")
+    ec = julia_helpers.import_package("EquivalentCircuits", Main=Main)
+    # Test Main is not required
+    ec = julia_helpers.import_package("EquivalentCircuits")
 
     # Throw error for non-existent module
     with pytest.raises(Exception):
-        julia_helpers.import_package(Main, "NonExistentModule")
+        julia_helpers.import_package("NonExistentModule", Main)
diff --git a/tests/test_io.py b/tests/test_io.py
@@ -15,8 +15,8 @@ def test_load_eis_data():
         ae.load_eis_data("nonexistentfile.csv")
 
     # Load a valid txt file of EIS data
-    fpath = ASSETS_DIR / 'testdata.txt'
-    df = ae.load_eis_data(fpath)
+    fpath = ASSETS_DIR / 'test_data.txt'
+    df = ae.io.load_eis_data(fpath)
     frequencies = np.array(df["freq/Hz"]).astype(float)
     reals = np.array(df["Re(Z)/Ohm"]).astype(float)
     imags = -np.array(df["-Im(Z)/Ohm"]).astype(float)