make pytest not output log messages, since we capture these in files

firedrakeproject · Mar 10, 2025 · 3d3774c · 3d3774c
1 parent 2b0092a
commit 3d3774c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       PYOP2_CFLAGS: -O0
       # Make sure that tests with >4 processes are not silently skipped
       PYTEST_MPI_MAX_NPROCS: 4
-      EXTRA_PYTEST_ARGS: --durations=100 --timeout=3600 --timeout-method=thread -o faulthandler_timeout=3660 --verbose gusto-repo/unit-tests gusto-repo/integration-tests gusto-repo/examples
+      EXTRA_PYTEST_ARGS: --durations=100 --timeout=3600 --timeout-method=thread -o faulthandler_timeout=3660 --show-capture=no --verbose gusto-repo/unit-tests gusto-repo/integration-tests gusto-repo/examples
     steps:
       - name: Fix HOME
         # For unknown reasons GitHub actions overwrite HOME to /github/home
@@ -70,9 +70,9 @@ jobs:
         run: |
           . venv-gusto/bin/activate
           : # Run the serial tests
-          firedrake-run-split-tests 1 1 -n 12 --verbose gusto-repo/integration-tests/model/test_nc_outputting.py  --log-file=gusto_netcdf_serial.log
+          firedrake-run-split-tests 1 1 -n 12 --verbose gusto-repo/integration-tests/model/test_nc_outputting.py  --log-file=gusto_netcdf_serial.log --show-capture=no
           : # Run the parallel tests
-          firedrake-run-split-tests 2 6 --verbose gusto-repo/integration-tests/model/test_nc_outputting.py --log-file=gusto_netcdf_parallel.log
+          firedrake-run-split-tests 2 6 --verbose gusto-repo/integration-tests/model/test_nc_outputting.py --log-file=gusto_netcdf_parallel.log --show-capture=no
         timeout-minutes: 10
 
       - name: Install parallel netCDF

diff --git a/Makefile b/Makefile
@@ -20,20 +20,20 @@ lint:
 
 test:
 	@echo "    Running all tests"
-	@python3 -m pytest unit-tests integration-tests examples $(PYTEST_ARGS)
+	@python3 -m pytest -q -s unit-tests integration-tests examples $(PYTEST_ARGS) --show-capture=no
 
 unit_test:
 	@echo "    Running all unit-tests"
-	@python3 -m pytest unit-tests $(PYTEST_ARGS)
+	@python3 -m pytest -q -s unit-tests $(PYTEST_ARGS) --show-capture=no
 
 integration_test:
 	@echo "    Running all integration-tests"
-	@python3 -m pytest integration-tests $(PYTEST_ARGS)
+	@python3 -m pytest -q -s integration-tests $(PYTEST_ARGS) --show-capture=no
 
 example:
 	@echo "    Running all examples"
-	@python3 -m pytest examples -v -m "not parallel" $(PYTEST_ARGS)
+	@python3 -m pytest -q -s examples -v -m "not parallel" $(PYTEST_ARGS) --show-capture=no
 
 parallel_example:
 	@echo "    Running all parallel examples"
-	@python3 -m pytest examples -v -m "parallel" $(PYTEST_ARGS)
+	@python3 -m pytest -q -s examples -v -m "parallel" $(PYTEST_ARGS) --show-capture=no