From a64e9bef105f108a585bf60d4451cdd3f7a3473f Mon Sep 17 00:00:00 2001 From: Chase Qi Date: Mon, 28 Nov 2016 12:25:57 +0800 Subject: automated: linux: unify mysql password for LAMP and LEMP tests Change-Id: I1a6d2dd4b16d1a7d2fff88af4c7e98d4e06d2636 Signed-off-by: Chase Qi --- automated/linux/lamp/html/add-record.php | 2 +- automated/linux/lamp/html/connect-db.php | 2 +- automated/linux/lamp/html/create-db.php | 2 +- automated/linux/lamp/html/create-table.php | 2 +- automated/linux/lamp/html/delete-record.php | 2 +- automated/linux/lamp/html/select-record.php | 2 +- automated/linux/lamp/lamp.sh | 6 +++--- automated/linux/lemp/html/add-record.php | 2 +- automated/linux/lemp/html/connect-db.php | 2 +- automated/linux/lemp/html/create-db.php | 2 +- automated/linux/lemp/html/create-table.php | 2 +- automated/linux/lemp/html/delete-record.php | 2 +- automated/linux/lemp/html/select-record.php | 2 +- automated/linux/lemp/lemp.sh | 6 +++--- 14 files changed, 18 insertions(+), 18 deletions(-) (limited to 'automated') diff --git a/automated/linux/lamp/html/add-record.php b/automated/linux/lamp/html/add-record.php index f721677..f7802ae 100644 --- a/automated/linux/lamp/html/add-record.php +++ b/automated/linux/lamp/html/add-record.php @@ -1,7 +1,7 @@ /dev/null 2>&1 || true -mysql --user="root" --password="lamptest" -e "show databases" +mysqladmin -u root password lxmptest > /dev/null 2>&1 || true +mysql --user="root" --password="lxmptest" -e "show databases" check_return "mysql-show-databases" # Test PHP. @@ -104,4 +104,4 @@ grep "Record deleted successfully" "${OUTPUT}/delete-record" check_return "php-delete-record" # Delete myDB for the next run. -mysql --user='root' --password='lamptest' -e 'DROP DATABASE myDB' +mysql --user='root' --password='lxmptest' -e 'DROP DATABASE myDB' diff --git a/automated/linux/lemp/html/add-record.php b/automated/linux/lemp/html/add-record.php index 955652a..f7802ae 100644 --- a/automated/linux/lemp/html/add-record.php +++ b/automated/linux/lemp/html/add-record.php @@ -1,7 +1,7 @@ /dev/null 2>&1 || true -test_command="mysql --user='root' --password='lemptest' -e 'show databases'" +mysqladmin -u root password lxmptest > /dev/null 2>&1 || true +test_command="mysql --user='root' --password='lxmptest' -e 'show databases'" run_test_case "${test_command}" "mysql-show-databases" "${skip_list}" # Test PHP. @@ -135,7 +135,7 @@ run_test_case "${test_command}" "php-delete-record" # Cleanup. # Delete myDB for the next run. -mysql --user='root' --password='lemptest' -e 'DROP DATABASE myDB' +mysql --user='root' --password='lxmptest' -e 'DROP DATABASE myDB' # Restore from backups. rm -rf /usr/share/nginx/html -- cgit v1.2.3