From e88db91012d60413c022159c63b506f34901dd42 Mon Sep 17 00:00:00 2001
From: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date: Sun, 22 Sep 2024 11:21:15 +0200
Subject: [PATCH] clean up

---
 .github/workflows/container_build.yml      | 3 ---
 .github/workflows/container_build_push.yml | 4 +++-
 tests/test_container_template.py           | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
index cb3d50e..f4458c1 100644
--- a/.github/workflows/container_build.yml
+++ b/.github/workflows/container_build.yml
@@ -59,9 +59,6 @@ jobs:
 
       - name: Run unit tests
         run: |
-          docker run --rm ${{ env.TEST_TAG }} python --version
-          echo ${{ github.workspace }}
-          ls -la ${{ github.workspace }}/..
           docker run --rm -v ${{ github.workspace }}:/home ${{ env.TEST_TAG }} py.test -v tests
 
       - name: Build
diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml
index b63b5ef..c04db91 100644
--- a/.github/workflows/container_build_push.yml
+++ b/.github/workflows/container_build_push.yml
@@ -12,6 +12,8 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -51,7 +53,7 @@ jobs:
             ./dockerfiles/container_template/Dockerfile
       - name: Test
         run: |
-          docker run --rm ${{ env.TEST_TAG }} 
+          docker run --rm -v ${{ github.workspace }}:/home ${{ env.TEST_TAG }} py.test -v tests
   
       - name: Build and push
         uses: docker/build-push-action@v6
diff --git a/tests/test_container_template.py b/tests/test_container_template.py
index 3f36b87..aab0bb7 100644
--- a/tests/test_container_template.py
+++ b/tests/test_container_template.py
@@ -19,13 +19,13 @@
 port = sock.getsockname()[1]
 
 # Check that (1) singularity exist, and (2) if not, check for docker.
-# If neither are found, tests will not run.
+# If neither are found, tests will fall back to plain python.
 try:
     pth = os.path.join('containers', 'container_template.sif')
     out = subprocess.run('singularity')
     cwd = os.getcwd()
     PREFIX = f'singularity run {pth} python'
-    PREFIX_MOUNT = PREFIX_MOUNT = f'singularity run --home={cwd}:/home/ {pth} python'
+    PREFIX_MOUNT = f'singularity run --home={cwd}:/home/ {pth} python'
 except FileNotFoundError:
     try:
         out = subprocess.run('docker')