From 5f3a080af51b8a38c627f95df17a4ca3215a7df8 Mon Sep 17 00:00:00 2001 From: Samantha Date: Fri, 24 Jan 2025 14:01:43 -0500 Subject: [PATCH 1/2] test: No longer accumlate orphans for each test run --- t.sh | 5 ++--- tn.sh | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/t.sh b/t.sh index 08f181f5942..5c03ce0681b 100755 --- a/t.sh +++ b/t.sh @@ -10,9 +10,8 @@ if type realpath >/dev/null 2>&1 ; then fi # Generate the test keys and certs necessary for the integration tests. -docker compose run bsetup +docker compose run --rm bsetup # Use a predictable name for the container so we can grab the logs later # for use when testing logs analysis tools. -docker rm boulder_tests || true -exec docker compose run --name boulder_tests boulder ./test.sh "$@" +exec docker compose run --rm --name boulder_tests boulder ./test.sh "$@" diff --git a/tn.sh b/tn.sh index a3cda08221c..d47022e5768 100755 --- a/tn.sh +++ b/tn.sh @@ -10,9 +10,8 @@ if type realpath >/dev/null 2>&1 ; then fi # Generate the test keys and certs necessary for the integration tests. -docker compose run bsetup +docker compose run --rm bsetup # Use a predictable name for the container so we can grab the logs later # for use when testing logs analysis tools. -docker rm boulder_tests || true -exec docker compose -f docker-compose.yml -f docker-compose.next.yml run boulder ./test.sh "$@" +exec docker compose -f docker-compose.yml -f docker-compose.next.yml run --rm --name boulder_tests boulder ./test.sh "$@" From 0eb591fc75fea729b637839ca7248bca99855229 Mon Sep 17 00:00:00 2001 From: Samantha Date: Fri, 24 Jan 2025 14:35:00 -0500 Subject: [PATCH 2/2] Remove outdated comments. --- t.sh | 2 -- tn.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/t.sh b/t.sh index 5c03ce0681b..b49a916ee24 100755 --- a/t.sh +++ b/t.sh @@ -12,6 +12,4 @@ fi # Generate the test keys and certs necessary for the integration tests. docker compose run --rm bsetup -# Use a predictable name for the container so we can grab the logs later -# for use when testing logs analysis tools. exec docker compose run --rm --name boulder_tests boulder ./test.sh "$@" diff --git a/tn.sh b/tn.sh index d47022e5768..665e3a59bb2 100755 --- a/tn.sh +++ b/tn.sh @@ -12,6 +12,4 @@ fi # Generate the test keys and certs necessary for the integration tests. docker compose run --rm bsetup -# Use a predictable name for the container so we can grab the logs later -# for use when testing logs analysis tools. exec docker compose -f docker-compose.yml -f docker-compose.next.yml run --rm --name boulder_tests boulder ./test.sh "$@"