JCF: try to both not allow the program to skip the log writing if a p…

…ytest fails while still recording that it failed
DUNE-DAQ · Feb 9, 2025 · 2ad5214 · 2ad5214
1 parent e96f256
commit 2ad5214
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/.github/workflows/nightly-v5-integtest.yml b/.github/workflows/nightly-v5-integtest.yml
@@ -81,16 +81,17 @@ jobs:
         fail-fast: false
         matrix:
 
-            test_name: ["listrev_test",
-                        "3ru_1df_multirun_test",
-                        "3ru_3df_multirun_test",
-                        "example_system_test",
-                        "fake_data_producer_test",
-                        "long_window_readout_test",
-                        "minimal_system_quick_test",
-                        "readout_type_scan",
-                        "small_footprint_quick_test",
-                        "tpstream_writing_test"
+            test_name: [
+                        #"listrev_test",
+                        #"3ru_1df_multirun_test",
+                        #"3ru_3df_multirun_test",
+                        #"example_system_test",
+                        #"fake_data_producer_test",
+                        #"long_window_readout_test",
+                        #"minimal_system_quick_test",
+                        #"readout_type_scan",
+                        "small_footprint_quick_test"
+                        #"tpstream_writing_test"
                        ]
     defaults:
       run:
@@ -131,8 +132,10 @@ jobs:
           TEST_PATH=$DAQSYSTEMTEST_SHARE/integtest
         fi
         echo "INTEGTEST_OUTPUT_PATH=$INTEGTEST_OUTPUT_PATH" >> "$GITHUB_OUTPUT"
+
+        pytest_retval=0
         pytest -v -s --junit-xml=${{ matrix.test_name }}_results.xml \
-                $TEST_PATH/${{ matrix.test_name }}.py || true
+                $TEST_PATH/${{ matrix.test_name }}.py || { pytest_retval=$?; true; }
 
         mkdir -p $PERSISTENT_LOG_DIR
         cp -rL $(readlink -f /tmp/pytest-of-dunedaq/pytest-current/) $PERSISTENT_LOG_DIR/${{ matrix.test_name }}
@@ -144,6 +147,8 @@ jobs:
           exit 2
         fi
 
+        test $pytest_retval == 0 || false
+
   parse_results:
     runs-on: daq
     if: always()