From 8b9983dd76355fc41cd95ac329287845777ad356 Mon Sep 17 00:00:00 2001 From: Gavin Foster Date: Wed, 15 Feb 2023 12:02:29 +0000 Subject: [PATCH 1/7] Bug fix: Only call ws destroy if .my127ws exists --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 246284a05..bff20045b 100755 --- a/test +++ b/test @@ -256,7 +256,7 @@ function teardown() function clean() { if [ -d "$path_test" ]; then - (cd "$path_test" && ws destroy) || (docker ps -a && return 1) + (cd "$path_test" && -d ".my127ws" && ws destroy) || (docker ps -a && return 1) rm -rf "$path_test" fi } From 357abaf3376b65f2b366a43fb53404c292487272 Mon Sep 17 00:00:00 2001 From: Gavin Foster Date: Wed, 15 Feb 2023 12:11:19 +0000 Subject: [PATCH 2/7] Bug fix: Only call ws destroy if .my127ws exists --- test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test b/test index bff20045b..98bbb0c38 100755 --- a/test +++ b/test @@ -255,8 +255,8 @@ function teardown() function clean() { - if [ -d "$path_test" ]; then - (cd "$path_test" && -d ".my127ws" && ws destroy) || (docker ps -a && return 1) + if [ -d "$path_test" && -d ".my127ws"]; then + (cd "$path_test" && ws destroy || (docker ps -a && return 1) rm -rf "$path_test" fi } From 087606f22ec6fd3e52ae95dd8e045cd235406ac9 Mon Sep 17 00:00:00 2001 From: Gavin Foster Date: Wed, 15 Feb 2023 12:11:55 +0000 Subject: [PATCH 3/7] Bug fix: Only call ws destroy if .my127ws exists --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 98bbb0c38..3b1c6e0dd 100755 --- a/test +++ b/test @@ -255,7 +255,7 @@ function teardown() function clean() { - if [ -d "$path_test" && -d ".my127ws"]; then + if [ -d "$path_test" && -d "${path_test}/.my127ws"]; then (cd "$path_test" && ws destroy || (docker ps -a && return 1) rm -rf "$path_test" fi From 09e7ab947c6d95e7891e6deb41917cfcf61586e7 Mon Sep 17 00:00:00 2001 From: Gavin Foster Date: Wed, 15 Feb 2023 12:13:26 +0000 Subject: [PATCH 4/7] Bug fix: Only call ws destroy if .my127ws exists --- test | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test b/test index 3b1c6e0dd..42860edba 100755 --- a/test +++ b/test @@ -255,8 +255,10 @@ function teardown() function clean() { - if [ -d "$path_test" && -d "${path_test}/.my127ws"]; then - (cd "$path_test" && ws destroy || (docker ps -a && return 1) + if [ -d "$path_test"]; then + if [ -d "${path_test}/.my127ws"]; then + (cd "$path_test" && ws destroy || (docker ps -a && return 1) + fi rm -rf "$path_test" fi } From 8d87894b918663b41a8a167a6499d477a892efb3 Mon Sep 17 00:00:00 2001 From: Gavin Foster Date: Wed, 15 Feb 2023 12:14:19 +0000 Subject: [PATCH 5/7] Bug fix: Only call ws destroy if .my127ws exists --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 42860edba..df86b3f6f 100755 --- a/test +++ b/test @@ -257,7 +257,7 @@ function clean() { if [ -d "$path_test"]; then if [ -d "${path_test}/.my127ws"]; then - (cd "$path_test" && ws destroy || (docker ps -a && return 1) + (cd "$path_test" && ws destroy) || (docker ps -a && return 1) fi rm -rf "$path_test" fi From dc2f2bf4011d06abff3a5d4011010ebaad2fbd41 Mon Sep 17 00:00:00 2001 From: Gavin Foster <47179450+g-foster2@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:16:41 +0000 Subject: [PATCH 6/7] Update test Co-authored-by: andytson-inviqa --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index df86b3f6f..b4b20e670 100755 --- a/test +++ b/test @@ -255,7 +255,7 @@ function teardown() function clean() { - if [ -d "$path_test"]; then + if [ -d "$path_test" ]; then if [ -d "${path_test}/.my127ws"]; then (cd "$path_test" && ws destroy) || (docker ps -a && return 1) fi From 98e88f631d8cd66227b7a297a01eba208f8218b1 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Wed, 15 Feb 2023 12:21:29 +0000 Subject: [PATCH 7/7] Update test --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index b4b20e670..db36e55c5 100755 --- a/test +++ b/test @@ -256,7 +256,7 @@ function teardown() function clean() { if [ -d "$path_test" ]; then - if [ -d "${path_test}/.my127ws"]; then + if [ -d "${path_test}/.my127ws" ]; then (cd "$path_test" && ws destroy) || (docker ps -a && return 1) fi rm -rf "$path_test"