Try #1554:

Jenkinsfile

@@ -276,6 +276,7 @@ pipeline {
                 // They could be lingering if there were previous test failures.
                 sh 'docker system prune -f'
                 sh 'nix-shell --run "./scripts/pytest-tests.sh" ci.nix'
+                sh 'nix-shell --run "./scripts/pytest-tests.sh --clean-all-exit" ci.nix'
                 sh 'docker system prune -f'
               }
             }

io-engine/src/bin/io-engine-client/v1/controller_cli.rs

@@ -114,7 +114,9 @@ async fn controller_stats(
                 "READS",
                 "WRITES",
                 "READ/B",
-                "WRITTEN/B, NUM_UNMAPS, BYTES_UNMAPPED",
+                "WRITTEN/B",
+                "NUM_UNMAPS",
+                "BYTES_UNMAPPED",
             ];
             ctx.print_list(hdr, vec![row]);
         }

scripts/pytest-tests.sh

@@ -2,6 +2,18 @@
 
 set -eu -o pipefail
 
+function clean_all()
+{
+  echo "Cleaning up all docker-compose clusters..."
+  for file in $(find . -name docker-compose.yml); do
+    (
+      cd $(dirname $file)
+      docker-compose down 2>/dev/null || true
+    )
+  done
+  echo "Done"
+}
+
 function run_tests()
 {
   while read name extra
@@ -20,12 +32,12 @@ function run_tests()
       set -x
       python -m pytest --tc-file='test_config.ini' --docker-compose="$name" "$name"
     )
-    fi
-    if [ -f "$name" ]
+    elif [ -f "$name" ] || [ -f "${name%::*}" ]
     then
     (
       set -x
       base=$(dirname "$name")
+      ( cd $base; docker-compose down 2>/dev/null || true )
       python -m pytest --tc-file='test_config.ini' --docker-compose="$base" "$name"
     )
     fi
@@ -40,6 +52,28 @@ fi
 
 cd "$SRCDIR/test/python" && source ./venv/bin/activate
 
+TEST_LIST=
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --clean-all)
+      clean_all
+      ;;
+    --clean-all-exit)
+      clean_all
+      exit 0
+      ;;
+    *)
+      TEST_LIST="$TEST_LIST \n$1"
+      ;;
+  esac
+  shift
+done
+
+if [ -n "$TEST_LIST" ]; then
+  echo -e "$TEST_LIST" | run_tests
+  exit 0
+fi
+
 run_tests << 'END'
 
 tests/cli_controller