Use overtest to run MySQL

Change-Id: I7bbeff4e0c94f113e616d87f9bf8e9e2eac31d55

setup-tests.sh

@@ -18,17 +18,9 @@ clean_exit () {
 }
 
 GNOCCHI_DATA=`mktemp -d /tmp/gnocchi-data-XXXXX`
-MYSQL_DATA=`mktemp -d /tmp/gnocchi-mysql-XXXXX`
-trap "clean_exit \"$GNOCCHI_DATA\" \"$MYSQL_DATA\"" EXIT
+trap "clean_exit \"$GNOCCHI_DATA\"" EXIT
 
-mysqld --initialize-insecure --datadir=${MYSQL_DATA} || true
-mkfifo ${MYSQL_DATA}/out
-PATH=$PATH:/usr/libexec
-mysqld --no-defaults --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid --socket=${MYSQL_DATA}/mysql.socket --skip-networking --skip-grant-tables &> ${MYSQL_DATA}/out &
-# Wait for MySQL to start listening to connections
-wait_for_line "mysqld: ready for connections." ${MYSQL_DATA}/out
-export GNOCCHI_TEST_INDEXER_URL="mysql+pymysql://root@localhost/test?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8"
-mysql --no-defaults -S ${MYSQL_DATA}/mysql.socket -e 'CREATE DATABASE test;'
+source $(which overtest) mysql
 
 mkfifo ${GNOCCHI_DATA}/out
 cat > ${GNOCCHI_DATA}/gnocchi.conf <<EOF
@@ -42,7 +34,7 @@ file_basepath = ${GNOCCHI_DATA}
 driver = file
 coordination_url = file://${GNOCCHI_DATA}
 [indexer]
-url = mysql+pymysql://root@localhost/test?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8
+url = ${OVERTEST_URL/#mysql:/mysql+pymysql:}
 EOF
 gnocchi-upgrade --config-file ${GNOCCHI_DATA}/gnocchi.conf
 gnocchi-metricd --config-file ${GNOCCHI_DATA}/gnocchi.conf &>/dev/null &

tox.ini

@@ -11,6 +11,7 @@ setenv =
 passenv = GNOCCHI_* OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
 deps = .[test]
        http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz#egg=gnocchi[mysql,file]
+       overtest
 commands = {toxinidir}/setup-tests.sh python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]