Browse Source

Merge pull request #950 from infosiftr/mysql-initdb

Add new "mysql-initdb" test
yosifkit 10 years ago
parent
commit
3a9253175f

+ 1 - 0
test/config.sh

@@ -62,6 +62,7 @@ declare -A imageTests=(
 	'
 	[mysql]='
 		mysql-basics
+		mysql-initdb
 	'
 	[node]='
 	'

+ 22 - 4
test/tests/mysql-basics/run.sh

@@ -9,18 +9,36 @@ export MYSQL_PASSWORD='my cool mysql password'
 export MYSQL_DATABASE='my cool mysql database'
 
 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() {
-	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"
 }
 
-tries=10
+tries=20
 while ! echo 'SELECT 1' | mysql &> /dev/null; do
 	(( tries-- ))
 	if [ $tries -le 0 ]; then
 		echo >&2 'mysqld failed to accept connections in a reasonable amount of time!'
+		( set -x && docker logs "$cid" ) >&2 || true
 		echo 'SELECT 1' | mysql # to hopefully get a useful error message
 		false
 	fi
@@ -35,5 +53,5 @@ echo 'INSERT INTO test VALUES (2, 3, "goodbye!")' | mysql
 [ "$(echo 'SELECT COUNT(*) FROM test' | mysql)" = 2 ]
 echo 'DELETE FROM test WHERE a = 1' | mysql
 [ "$(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

+ 4 - 0
test/tests/mysql-initdb/initdb.sql

@@ -0,0 +1,4 @@
+CREATE TABLE test (a INT, b INT, c VARCHAR(255));
+INSERT INTO test VALUES (1, 2, 'hello');
+INSERT INTO test VALUES (2, 3, 'goodbye!');
+DELETE FROM test WHERE a = 1;

+ 51 - 0
test/tests/mysql-initdb/run.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+
+image="$1"
+testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
+
+export MYSQL_ROOT_PASSWORD='this is an example test password'
+export MYSQL_USER='0123456789012345' # "ERROR: 1470  String 'my cool mysql user' is too long for user name (should be no longer than 16)"
+export MYSQL_PASSWORD='my cool mysql password'
+export MYSQL_DATABASE='my cool mysql database'
+
+cname="mysql-container-$RANDOM-$RANDOM"
+cid="$(
+	docker run -d \
+		-e MYSQL_ROOT_PASSWORD \
+		-e MYSQL_USER \
+		-e MYSQL_PASSWORD \
+		-e MYSQL_DATABASE \
+		--name "$cname" \
+		-v "$testDir/initdb.sql:/docker-entrypoint-initdb.d/test.sql":ro \
+		"$image"
+)"
+trap "docker rm -f $cid > /dev/null" EXIT
+
+mysql() {
+	docker run --rm -i \
+		--link "$cname":mysql \
+		--entrypoint mysql \
+		-e MYSQL_PWD="$MYSQL_PASSWORD" \
+		"$image" \
+		-hmysql \
+		-u"$MYSQL_USER" \
+		--silent \
+		"$@" \
+		"$MYSQL_DATABASE"
+}
+
+tries=20
+while ! echo 'SELECT 1' | mysql &> /dev/null; do
+	(( tries-- ))
+	if [ $tries -le 0 ]; then
+		echo >&2 'mysqld failed to accept connections in a reasonable amount of time!'
+		( set -x && docker logs "$cid" ) >&2 || true
+		echo 'SELECT 1' | mysql # to hopefully get a useful error message
+		false
+	fi
+	sleep 2
+done
+
+[ "$(echo 'SELECT COUNT(*) FROM test' | mysql)" = 1 ]
+[ "$(echo 'SELECT c FROM test' | mysql)" = 'goodbye!' ]