Merge pull request #125 from mantidproject/switch-tests-directories

Switch tests directories to simplify using coverage
mantidproject · Jul 24, 2024 · 19dc50e · 19dc50e
2 parents 7cdcbe3 + 5ca9dff
commit 19dc50e
Show file tree

Hide file tree

Showing 93 changed files with 34 additions and 37 deletions.
diff --git a/.github/workflows/pr_workflow.yml b/.github/workflows/pr_workflow.yml
@@ -35,31 +35,31 @@ jobs:
 
       - name: Check for analysis files changed 
         run: |
-          echo "analysis-changed=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -q '^src/' && echo true || echo false)" >> $GITHUB_ENV
+          echo "analysis-changed=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -q -e '^src/' -e '^tests/' && echo true || echo false)" >> $GITHUB_ENV
 
       - name: Check for calibration files changed 
         run: |
-          echo "calibration-changed=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -q '^tools/calibration_scripts/' && echo true || echo false)" >> $GITHUB_ENV
+          echo "calibration-changed=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep -q -e '^tools/calibration_scripts/' -e '^tests/' && echo true || echo false)" >> $GITHUB_ENV
 
       - name: Run mvesuvio Analysis Unit Tests
         if: ${{ env.analysis-changed == 'true'}}
         run: |
-          python -m unittest discover -s ./tests/analysis/unit
+          python -m unittest discover -s ./tests/unit/analysis
 
       - name: Run mvesuvio Analysis System Tests
         if: ${{ env.analysis-changed == 'true'}}
         run: |
-          python -m unittest discover -s ./tests/analysis/system
+          python -m unittest discover -s ./tests/system/analysis
 
       - name: Run mvesuvio Calibration Unit Tests
         if: ${{ env.calibration-changed == 'true'}}
         run: |
-          python -m unittest discover -s ./tests/calibration/unit
+          python -m unittest discover -s ./tests/unit/calibration
 
       - name: Run Vesuvio Calibration System Tests
         if: ${{ env.calibration-changed == 'true'}}
         run: |
-          python -m unittest discover -s ./tests/calibration/system
+          python -m unittest discover -s ./tests/system/calibration
 
       # Report coverage
       #- name: Report Coverage