Merge pull request #4123 from M0ses/fix_database_ci_tests

[ci] fix database tests on installed systems
openSUSE · Nov 8, 2017 · 3f836c3 · 3f836c3
2 parents d6d00bb + e08a25a
commit 3f836c3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dist/t/0090-check_database.ts b/dist/t/0090-check_database.ts
@@ -14,5 +14,6 @@ TABLES_IN_DB=$(mysql -e "show tables" $DB_NAME)
 [[ $TABLES_IN_DB ]]
 is "$?" 0 "Checking if tables in database $DB_NAME"
 
-[ -f /srv/obs/MySQL/*.pid ]
+D=`ps -ef|grep "mysqld .* --datadir=/srv/obs/MySQL"|wc -l`
+[ $D -gt 1 ]
 is "$?" 0 "Checking if database is started under /srv/obs/MySQL"