Re enable integration tests

.github/workflows/process.yml

@@ -101,25 +101,26 @@ jobs:
           name: unit-coverage-artifacts
           path: .coverage
 
-  # integration-py38:
-  #   runs-on: ubuntu-latest
-  #   needs: make-py38
-  #   container:
-  #     image: ghcr.io/ukaea/process-ci:latest
-  #     credentials:
-  #       username: ${{ github.actor }}
-  #       password: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Download build artifacts
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: process-build-artifacts
-  #         path: process/
-  #     - name: Install PROCESS
-  #       run: pip install -e .
-  #     - name: Run integration tests
-  #       run: pytest tests/integration/ -n auto -v
+  integration-py38:
+    runs-on: ubuntu-latest
+    needs: make-py38
+    container:
+      image: ghcr.io/ukaea/process-ci:latest
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download build artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: process-build-artifacts
+          path: process/
+      - name: Install PROCESS
+        run: pip install -e .
+      - name: Run integration tests
+        run: pytest tests/integration -n auto -v
+
 
   regression-py38:
     runs-on: ubuntu-latest

.gitignore

@@ -71,3 +71,4 @@ REBCO_JC.DAT
 *.whl
 python_modules.txt
 quench_data.DAT
+env-fork

examples/a_scan_input_file_IN.DAT

@@ -129,8 +129,6 @@ fiooic = 0.65
 *--------------------------*
 icc = 34
 ixc = 51 * fvdump
-ixc = 52 * vdalw [kV]
-boundu(52) = 10.0
 fvdump = 1.0
 vdalw = 10.0
 

tests/integration/data/large_tokamak_IN.DAT

@@ -129,8 +129,6 @@ fiooic = 0.65
 *--------------------------*
 icc = 34
 ixc = 51 * fvdump
-ixc = 52 * vdalw [kV]
-boundu(52) = 10.0
 fvdump = 1.0
 vdalw = 10.0
 

tests/integration/data/ref_IN.DAT

@@ -62,8 +62,6 @@ ixc = 49 * fstrcond
 ixc = 50 * fiooic
 boundu(50) = 1.0
 ixc = 51 * fvdump
-ixc = 52 * vdalw
-boundu(52) = 10.0
 ixc = 53 * fjprot
 ixc = 56 * tdmptf
 ixc = 57 * thkcas

tests/integration/data/uncertainties_nonopt_ref_IN.DAT

@@ -62,8 +62,6 @@ ixc = 49 * fstrcond
 ixc = 50 * fiooic
 boundu(50) = 1.0
 ixc = 51 * fvdump
-ixc = 52 * vdalw
-boundu(52) = 10.0
 ixc = 53 * fjprot
 ixc = 56 * tdmptf
 ixc = 57 * thkcas

tests/integration/data/uncertainties_ref_IN.DAT

@@ -62,8 +62,6 @@ ixc = 49 * fstrcond
 ixc = 50 * fiooic
 boundu(50) = 1.0
 ixc = 51 * fvdump
-ixc = 52 * vdalw
-boundu(52) = 10.0
 ixc = 53 * fjprot
 ixc = 56 * tdmptf
 ixc = 57 * thkcas

tests/integration/test_examples.py

@@ -2,6 +2,7 @@
 
 examples.py is created by exporting examples.ipynb as a Python script.
 """
+
 import runpy
 import os
 from pathlib import Path
@@ -78,6 +79,7 @@ def scan_cleanup(examples_as_cwd):
             os.remove(file)
 
 
+@pytest.mark.skip(reason="Skipping test until fixed in issue #3071")
 def test_scan(scan_cleanup):
     """Run the scan.py script and check no exceptions are raised.
 

tests/integration/test_solver.py

@@ -1,4 +1,5 @@
 """Tests for the Process solver."""
+
 import time
 from numpy import histogram
 from process.io.mfile import MFile
@@ -37,7 +38,7 @@ def test_solver(temp_data):
         April 2015 - Code modified by Sarah Medley to also calculate Q - see above
 
     - Input files -
-    test_process.conf: in integration/data dir
+    test_solver.conf: in integration/data dir
 
     - Output files -
     Saved to temporary test dir

tests/unit/data/large_tokamak_IN.DAT

@@ -129,8 +129,6 @@ fiooic = 0.65
 *--------------------------*
 icc = 34
 ixc = 51 * fvdump
-ixc = 52 * vdalw [kV]
-boundu(52) = 10.0
 fvdump = 1.0
 vdalw = 10.0