From afe5558ef2207bb8de255c64ae95603671a87dc5 Mon Sep 17 00:00:00 2001
From: Clair Mould <86794332+clmould@users.noreply.github.com>
Date: Thu, 8 Feb 2024 16:29:30 +0000
Subject: [PATCH 1/5] deleted commented out integration test code

---
 .github/workflows/process.yml | 20 +-------------------
 .gitignore                    |  1 +
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/process.yml b/.github/workflows/process.yml
index df8c01e80b..ee6cbcab44 100644
--- a/.github/workflows/process.yml
+++ b/.github/workflows/process.yml
@@ -101,25 +101,7 @@ 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
+  
 
   regression-py38:
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index 0787281ed6..2628eff462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ REBCO_JC.DAT
 *.whl
 python_modules.txt
 quench_data.DAT
+env-fork
\ No newline at end of file

From ebf1ab4f1ee65c37eff28558bf3569ce29031b06 Mon Sep 17 00:00:00 2001
From: Clair Mould <86794332+clmould@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:51:46 +0000
Subject: [PATCH 2/5] attempt at integration tests

---
 .github/workflows/process.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.github/workflows/process.yml b/.github/workflows/process.yml
index ee6cbcab44..872fedabad 100644
--- a/.github/workflows/process.yml
+++ b/.github/workflows/process.yml
@@ -101,6 +101,25 @@ 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
   
 
   regression-py38:

From 6facea76c9a85b6c6c721d5759986aa76165eb5e Mon Sep 17 00:00:00 2001
From: Clair Mould <86794332+clmould@users.noreply.github.com>
Date: Tue, 27 Feb 2024 13:45:18 +0000
Subject: [PATCH 3/5] add -n auto -v to integration test ci

---
 .github/workflows/process.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/process.yml b/.github/workflows/process.yml
index 872fedabad..5b010a788d 100644
--- a/.github/workflows/process.yml
+++ b/.github/workflows/process.yml
@@ -119,7 +119,7 @@ jobs:
       - name: Install PROCESS
         run: pip install -e .
       - name: Run integration tests
-        run: pytest tests/integration
+        run: pytest tests/integration -n auto -v
   
 
   regression-py38:

From f7b2dc5c0a79450de974de57e03d6d48f85347ae Mon Sep 17 00:00:00 2001
From: Clair Mould <86794332+clmould@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:35:22 +0000
Subject: [PATCH 4/5] remove vdalw from input files used in integration and
 unit tests

---
 examples/a_scan_input_file_IN.DAT                      | 2 --
 tests/integration/data/large_tokamak_IN.DAT            | 2 --
 tests/integration/data/ref_IN.DAT                      | 2 --
 tests/integration/data/uncertainties_nonopt_ref_IN.DAT | 2 --
 tests/integration/data/uncertainties_ref_IN.DAT        | 2 --
 tests/integration/test_solver.py                       | 3 ++-
 tests/unit/data/large_tokamak_IN.DAT                   | 2 --
 7 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/examples/a_scan_input_file_IN.DAT b/examples/a_scan_input_file_IN.DAT
index 5d38dad819..e10bc25de5 100644
--- a/examples/a_scan_input_file_IN.DAT
+++ b/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
 
diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT
index 4acbc76b48..a1298b175f 100644
--- a/tests/integration/data/large_tokamak_IN.DAT
+++ b/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
 
diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT
index 4ea7753a11..de19f450cb 100644
--- a/tests/integration/data/ref_IN.DAT
+++ b/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
diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
index 90dd567d3c..1083eb46ca 100644
--- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
+++ b/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
diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT
index ca8c4c947e..ed8b8cbce4 100644
--- a/tests/integration/data/uncertainties_ref_IN.DAT
+++ b/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
diff --git a/tests/integration/test_solver.py b/tests/integration/test_solver.py
index 7db4e6b9cb..2ad4cd2beb 100755
--- a/tests/integration/test_solver.py
+++ b/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
diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT
index 65094ff6ec..02c25de0d4 100644
--- a/tests/unit/data/large_tokamak_IN.DAT
+++ b/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
 

From 6ac2bb0f7803faf975e59492d184dee573627344 Mon Sep 17 00:00:00 2001
From: Clair Mould <86794332+clmould@users.noreply.github.com>
Date: Thu, 14 Mar 2024 14:59:06 +0000
Subject: [PATCH 5/5] skip test_scan

---
 tests/integration/test_examples.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/integration/test_examples.py b/tests/integration/test_examples.py
index e1f9d9860f..5138babc20 100644
--- a/tests/integration/test_examples.py
+++ b/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.