Testsuite: account for (now) properly working Perl locale

[exim.git] / test / scripts / 2610-MySQL / 2610

diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610
index 5c104f3fe84d7091ba343b72532e2bc658b707c0..c9e0d5977ab95e0a112a5d904091580f5691a7d2 100644 (file)
--- a/test/scripts/2610-MySQL/2610
+++ b/test/scripts/2610-MySQL/2610
@@ -4,19 +4,22 @@
 #
 # first, populate a DB to test against
 sudo rm -fr DIR/mysql
 #
 # first, populate a DB to test against
 sudo rm -fr DIR/mysql

+echo Installing DB server dir

 perl
 system 'mysql_install_db --no-defaults --datadir=DIR/mysql --user=CALLER';
 ****
 sudo rm test-stdout test-stderr
 #
 # start a db server
 perl
 system 'mysql_install_db --no-defaults --datadir=DIR/mysql --user=CALLER';
 ****
 sudo rm test-stdout test-stderr
 #
 # start a db server

+echo Starting DB server

 background
 DIR/bin.sys/mysqld --datadir=DIR/mysql --log-error=DIR/mysql/log --bind-address=* --port=PORT_N --socket=DIR/mysql/sock --pid-file=DIR/mysql/pidfile
 ****
 #
 # wait for db startup, insert some data
 background
 DIR/bin.sys/mysqld --datadir=DIR/mysql --log-error=DIR/mysql/log --bind-address=* --port=PORT_N --socket=DIR/mysql/sock --pid-file=DIR/mysql/pidfile
 ****
 #
 # wait for db startup, insert some data

+echo Waiting for DB server startup

 perl
 perl

-system 'mysqladmin --protocol=TCP -P PORT_N --connect_timeout=1 --wait=5 -u root create test';
+system 'mysqladmin --protocol=TCP -P PORT_N --connect_timeout=2 --wait=5 -u root create test';

 my $fh;
 open($fh, '-|', 'mysql --protocol=TCP -P PORT_N -u root -D test -e "select 1 from mysql.user where User = \'root\' and Host = \'HOSTIPV4\'"');
 my $line = <$fh>;
 my $fh;
 open($fh, '-|', 'mysql --protocol=TCP -P PORT_N -u root -D test -e "select 1 from mysql.user where User = \'root\' and Host = \'HOSTIPV4\'"');
 my $line = <$fh>;


@@ -41,6 +44,7 @@ system 'mysql --protocol=TCP -P PORT_N -u root -D test \
      GRANT ALL ON *.* TO \'CALLER\'@\'HOSTIPV4\'; \
  "';
 ****
      GRANT ALL ON *.* TO \'CALLER\'@\'HOSTIPV4\'; \
  "';
 ****

+echo Populated DB

 sudo rm test-stderr-server
 #
 #
 sudo rm test-stderr-server
 #
 #


@@ -79,4 +83,4 @@ perl
 system 'mysqladmin --protocol=TCP -P PORT_N -u root shutdown';
 ****
 killdaemon
 system 'mysqladmin --protocol=TCP -P PORT_N -u root shutdown';
 ****
 killdaemon

-#sudo rm -fr DIR/mysql
+sudo rm -fr DIR/mysql