From 16b2c74630303077a405daba23d4c56437e77379 Mon Sep 17 00:00:00 2001 From: Ernie Billing Date: Thu, 12 Nov 2020 10:03:17 -0800 Subject: [PATCH] [#175098075] test db cleanup --- acceptance-tests/azure/cf-test-masb-sql-db-subsume.sh | 2 +- acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acceptance-tests/azure/cf-test-masb-sql-db-subsume.sh b/acceptance-tests/azure/cf-test-masb-sql-db-subsume.sh index 144c35a37..34395874b 100755 --- a/acceptance-tests/azure/cf-test-masb-sql-db-subsume.sh +++ b/acceptance-tests/azure/cf-test-masb-sql-db-subsume.sh @@ -17,7 +17,7 @@ SERVER_RESOURCE_GROUP=$2 SERVER_ADMIN_USER_NAME=$3 SERVER_ADMIN_PASSWORD=$4 DB_NAME=sdb-$$ -SUBSUMED_INSTANCE_NAME=masb-sql-db-subsume-test-$$ +SUBSUMED_INSTANCE_NAME=masb-sql-db-$$ MASB_SQLDB_INSTANCE_NAME=mssql-db-$$ MASB_DB_CONFIG="{ \ diff --git a/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh b/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh index 4bd555065..35c8af876 100755 --- a/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh +++ b/acceptance-tests/azure/cf-test-masb-sql-fog-db-subsume.sh @@ -23,7 +23,7 @@ shift SERVER_ADMIN_PASSWORD=$1 shift -DB_NAME=testdb-$$ +DB_NAME=subsume-db-$$ RESULT=1 MASB_SQLDB_INSTANCE_NAME=mssql-db-$$ @@ -96,8 +96,8 @@ if create_service azure-sqldb StandardS0 "${MASB_SQLDB_INSTANCE_NAME}" "${MASB_D echo "subsumed masb fog instance test failed" fi delete_service "${SUBSUMED_INSTANCE_NAME}" - cf purge-service-instance -f "${MASB_FOG_INSTANCE_NAME}" - cf purge-service-instance -f "${MASB_SQLDB_INSTANCE_NAME}" + delete_service "${MASB_FOG_INSTANCE_NAME}" + delete_service "${MASB_SQLDB_INSTANCE_NAME}" fi else echo spring music test failed on masb fog