소스 검색

Add "trap" to mysql-basics test for deleting the container even in failure

Tianon Gravi 10 년 전
부모
커밋
0ad1162117
1개의 변경된 파일1개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 2
      test/tests/mysql-basics/run.sh

+ 1 - 2
test/tests/mysql-basics/run.sh

@@ -10,6 +10,7 @@ export MYSQL_DATABASE='my cool mysql database'
 
 
 cname="mysql-container-$RANDOM-$RANDOM"
 cname="mysql-container-$RANDOM-$RANDOM"
 cid="$(docker run -d -e MYSQL_ROOT_PASSWORD -e MYSQL_USER -e MYSQL_PASSWORD -e MYSQL_DATABASE --name "$cname" "$image")"
 cid="$(docker run -d -e MYSQL_ROOT_PASSWORD -e MYSQL_USER -e MYSQL_PASSWORD -e MYSQL_DATABASE --name "$cname" "$image")"
+trap "docker rm -f $cid > /dev/null" EXIT
 
 
 mysql() {
 mysql() {
 	docker run --rm -i --link "$cname":mysql --entrypoint mysql -e MYSQL_PWD="$MYSQL_PASSWORD" "$image" -hmysql -u"$MYSQL_USER" --silent "$@" "$MYSQL_DATABASE"
 	docker run --rm -i --link "$cname":mysql --entrypoint mysql -e MYSQL_PWD="$MYSQL_PASSWORD" "$image" -hmysql -u"$MYSQL_USER" --silent "$@" "$MYSQL_DATABASE"
@@ -36,5 +37,3 @@ echo 'DELETE FROM test WHERE a = 1' | mysql
 [ "$(echo 'SELECT COUNT(*) FROM test' | mysql)" = 1 ]
 [ "$(echo 'SELECT COUNT(*) FROM test' | mysql)" = 1 ]
 [ "$(echo 'SELECT c FROM test' | mysql)" = "goodbye!" ]
 [ "$(echo 'SELECT c FROM test' | mysql)" = "goodbye!" ]
 echo 'DROP TABLE test' | mysql
 echo 'DROP TABLE test' | mysql
-
-docker rm -f "$cid" > /dev/null # TODO somehow make sure this goes away if the tests fail, too