From f889d22a0ff413cdcf176625b43f329c346cd7e2 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Fri, 1 Nov 2024 00:51:35 -0400
Subject: Tests: Force the removal of podman containers

---
 tests/setup.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'tests/setup.sh')

diff --git a/tests/setup.sh b/tests/setup.sh
index 0875cac..14d8e6d 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -253,8 +253,18 @@ assert_file_contains() {
     fi
 }
 
+clean_up_docker() {
+    CONTAINERS_DIR="$WORKSPACE/.local/share/containers"
+    # HOME points to the WORKSPACE. The only reason we'd have this directory is if docker/podman was executed
+    # Fair to assume if the directory exists, docker/podman is functional.
+    if [ -d "$CONTAINERS_DIR" ]; then
+        docker run --rm -it -v $CONTAINERS_DIR:/data alpine sh -c '/bin/rm -r -f /data/*'
+    fi
+}
+
 clean_up() {
-    if [ -z "$RT_KEEP_WORKSPACE" ] && [ -d "$WORKSPACE" ]; then
+    if ([ -z "$RT_KEEP_WORKSPACE" ] || [ -z "$KEEP_WORKSPACE" ]) && [ -d "$WORKSPACE" ]; then
+        clean_up_docker
         rm -rf "$WORKSPACE"
     fi
 
-- 
cgit 


From 72131909bdcba9a33f179025f60362004d76d083 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Fri, 1 Nov 2024 00:51:55 -0400
Subject: Change default RT workspace directory path

---
 tests/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/setup.sh')

diff --git a/tests/setup.sh b/tests/setup.sh
index 14d8e6d..3fda829 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -24,7 +24,7 @@ setup_script_dir="$(dirname ${BASH_SOURCE[0]})"
 export TOPDIR=$(pwd)
 export TEST_DATA="$TOPDIR"/data
 
-WS_DEFAULT=rt_workspace_
+WS_DEFAULT="workspaces/rt_workspace_"
 setup_workspace() {
     if [ -z "$1" ]; then
         echo "setup_workspace requires a name argument" >&2
-- 
cgit 


From f9ff852d66c16e541bd43c4d3680314581477036 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Sat, 2 Nov 2024 11:30:30 -0400
Subject: Squelch shell's pushd/popd commands

---
 tests/setup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests/setup.sh')

diff --git a/tests/setup.sh b/tests/setup.sh
index 3fda829..50209ae 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -24,6 +24,14 @@ setup_script_dir="$(dirname ${BASH_SOURCE[0]})"
 export TOPDIR=$(pwd)
 export TEST_DATA="$TOPDIR"/data
 
+pushd() {
+    command pushd "$@" 1>/dev/null
+}
+
+popd() {
+    command popd 1>/dev/null
+}
+
 WS_DEFAULT="workspaces/rt_workspace_"
 setup_workspace() {
     if [ -z "$1" ]; then
-- 
cgit