Added tests

williamdes · williamdes · commit ea3256af181b · 2018-05-02T14:19:49.000+02:00
diff --git a/backup.sh b/backup.sh
@@ -248,11 +248,16 @@ if [ "$?" -eq 0 ]; then
   # Needs refactor
   GRANTS_SQL="select distinct concat( \"SHOW GRANTS FOR '\",user,\"'@'\",host,\"';\" ) from mysql.user WHERE user != 'root';"
   GRANTS_LIST=$(mysql ${MYSQL_CONN} -ANe"${GRANTS_SQL}")
-  echo ${GRANTS_LIST} | mysql --default-character-set=utf8 --skip-comments ${MYSQL_CONN} | sed 's/\(GRANT .*\)/\1;/;s/^\(Grants for .*\)/-- \1 --/;/--/{x;p;x;}' > ${BACKUP_DIR}/grants.sql
-
+  if [ "$?" -ne 0 ]; then
+    exitWithMsg 215 "Grants list failed"
+  fi
+  GRANTS_LIST=$(echo ${GRANTS_LIST} | mysql --default-character-set=utf8 --skip-comments ${MYSQL_CONN})
   if [ "$?" -ne 0 ]; then
     exitWithMsg 214 "Grants dump failed"
   fi
+  echo ${GRANTS_LIST} | sed 's/\(GRANT .*\)/\1;/;s/^\(Grants for .*\)/-- \1 --/;/--/{x;p;x;}' > ${BACKUP_DIR}/grants.sql
+
+
   # Removes double backslashes >  \\
   sed -i -e 's/\\\\//g' ${BACKUP_DIR}/grants.sql
   # echo -e ${GRANTS_SQL}
diff --git a/samples/empty/grants.sql b/samples/empty/grants.sql
@@ -0,0 +1 @@
+
diff --git a/samples/withdata0/grants.sql b/samples/withdata0/grants.sql
@@ -0,0 +1 @@
+
diff --git a/samples/withdata1/grants.sql b/samples/withdata1/grants.sql
@@ -0,0 +1 @@
+
diff --git a/samples/withdata2/createuser.sql b/samples/withdata2/createuser.sql
@@ -0,0 +1 @@
+CREATE USER 'userwd2gf'@'%' IDENTIFIED BY 'testbench';
diff --git a/samples/withdata2/deleteuser.sql b/samples/withdata2/deleteuser.sql
@@ -0,0 +1 @@
+DROP USER 'userwd2gf'@'%';
diff --git a/samples/withdata2/function1.sql b/samples/withdata2/function1.sql
@@ -0,0 +1,2 @@
+USE testbench;
+CREATE DEFINER=`root`@`%` FUNCTION `procédure de test n°2`(`entrée 1` VARCHAR(35) CHARSET cp1250) RETURNS INT(1) UNSIGNED COMMENT "procédure de test n°2" NOT DETERMINISTIC NO SQL SQL SECURITY DEFINER RETURN 1;
diff --git a/samples/withdata2/grantToDB.sql b/samples/withdata2/grantToDB.sql
@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON mysql.db TO 'userwd2gf'@'%';
diff --git a/samples/withdata2/grantToUsers.sql b/samples/withdata2/grantToUsers.sql
@@ -0,0 +1 @@
+GRANT ALL PRIVILEGES ON mysql.user TO 'userwd2gf'@'%';
diff --git a/samples/withdata2/grants.sql b/samples/withdata2/grants.sql
@@ -0,0 +1 @@
+
diff --git a/samples/withdata2/trigger1.sql b/samples/withdata2/trigger1.sql
@@ -0,0 +1,2 @@
+USE testbench;
+CREATE  DEFINER=`root`@`%` TRIGGER `dummyTrigger` BEFORE INSERT ON `table hérétique ! @*:` FOR EACH ROW SET new.`ma première colonne` = "";
diff --git a/tests.sh b/tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Error codes
 # 200 = Empty Variable
 # 201 = Value is not a file
@@ -15,6 +15,7 @@
 # 212 = Views dump failed
 # 213 = Users dump failed
 # 214 = Grants dump failed
+# 215 = Grants list failed
 
 MYSQL_HOST="localhost"
 MYSQL_USER="root"
@@ -23,11 +24,6 @@ SCRIPT_ROOT="$(dirname $0)"
 echo "SCRIPT_ROOT=${SCRIPT_ROOT}"
 MYSQLCREDS="-h${MYSQL_HOST} -u${MYSQL_USER} -p${MYSQL_PASS}"
 
-testEMPTY_VAR_Fail() {
-  ./backup.sh 1>/dev/null 2>&1
-  assertEquals 200 "$?"
-}
-
 compareFiles() {
   compareFilesOrExit "${SCRIPT_ROOT}/samples/$1/structure.sql" "${SCRIPT_ROOT}/test/structure.sql"
   compareFilesOrExit "${SCRIPT_ROOT}/samples/$1/database.sql" "${SCRIPT_ROOT}/test/database.sql"
@@ -39,6 +35,10 @@ compareFiles() {
   compareFilesOrExit "${SCRIPT_ROOT}/samples/$1/routines.sql" "${SCRIPT_ROOT}/test/routines.sql"
 }
 
+sourceCopy() {
+  sed -n "/^$1()/,/^}/p" ./backup.sh > func.sh; source func.sh; rm func.sh
+}
+
 compareFilesSUM() {
 
   chk1="$(sha1sum $1 | awk -F" " '{print $1}')"
@@ -57,6 +57,11 @@ compareFilesOrExit() {
   compareFilesSUM "$@" || fail "Files are not identical ($1) ($2)"
 }
 
+testEMPTY_VAR_Fail() {
+  ./backup.sh 1>/dev/null 2>&1
+  assertEquals 200 "$?"
+}
+
 testBACKUP_CONFIG_ENVFILE_Fail() {
   export BACKUP_CONFIG_ENVFILE="/home/myuser/secretbackupconfig.env.txt"
   ./backup.sh
@@ -176,8 +181,11 @@ testBACKUP_Success_NoDiff_Strange_BS_Data2() {
 
 testBACKUP_Success_NoDatabases() {
   preTest
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
+  echo "MYSQL_USER=grantfail" >> "./test/envfile"
   ./backup.sh
   assertEquals 206 "$?"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
   postTest
 }
 
@@ -196,15 +204,15 @@ testEvents_NoData_Fail() {
   postTest
 }
 
-testViews_Fail() {
+testViewsDump_Fail() {
   preTest
   createTestData "withdata2"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
-  mysql ${MYSQLCREDS} -ANe "GRANT SELECT, EVENT, TRIGGER ON testbench.* TO 'grantfail'@'%';"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'grantfail'@'%';"
   echo "MYSQL_USER=grantfail" >> "./test/envfile"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-  echo "MYSQL_USER=grantfail" >> "./test/envfile"
+  echo "SKIP_OP=structure,data,routines,events,triggers,users,grants" >> "./test/envfile"
   ./backup.sh
   assertEquals 212 "$?"
   destroyTestData "withdata2"
@@ -233,7 +241,6 @@ testEvents_Fail() {
   echo "MYSQL_USER=grantfail" >> "./test/envfile"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-  echo "MYSQL_USER=grantfail" >> "./test/envfile"
   ./backup.sh
   assertEquals 211 "$?"
   destroyTestData "withdata2"
@@ -249,62 +256,107 @@ testStructure_Fail() {
   echo "MYSQL_USER=grantfail" >> "./test/envfile"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-  echo "MYSQL_USER=grantfail" >> "./test/envfile"
   ./backup.sh
   assertEquals 207 "$?"
   destroyTestData "withdata2"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
   postTest
 }
 
-#testData_Fail() {
-#  preTest
-#  createTestData "withdata2"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
-#  mysql ${MYSQLCREDS} -ANe "GRANT INSERT, TRIGGER, SHOW VIEW, ALTER ON testbench.* TO 'grantfail'@'%';"
-#  echo "MYSQL_USER=grantfail" >> "./test/envfile"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-#  echo "MYSQL_USER=grantfail" >> "./test/envfile"
-#  ./backup.sh
-#  assertEquals 208 "$?"
-#  destroyTestData "withdata2"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
-#  postTest
-#}
-
-#testRoutines_Fail() {
-#  preTest
-#  createTestData "withdata2"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
-#  mysql ${MYSQLCREDS} -ANe "GRANT SELECT, TRIGGER, SHOW VIEW, EVENT ON testbench.* TO 'grantfail'@'%';"
-#  mysql ${MYSQLCREDS} -ANe "CREATE DEFINER=`root`@`%` FUNCTION `procédure de test n°2`(`entrée 1` VARCHAR(35) CHARSET cp1250) RETURNS INT(1) UNSIGNED COMMENT 'procédure de test n°2' NOT DETERMINISTIC NO SQL SQL SECURITY DEFINER RETURN 1;"
-#  echo "MYSQL_USER=grantfail" >> "./test/envfile"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-#  echo "MYSQL_USER=grantfail" >> "./test/envfile"
-#  ./backup.sh
-#  assertEquals 209 "$?"
-#  destroyTestData "withdata2"
-#  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
-#  postTest
-#}
-
-#testTriggers_Fail() {
-  #preTest
-  #createTestData "withdata2"
-  #mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
-  #mysql ${MYSQLCREDS} -ANe "GRANT SELECT, EVENT, SHOW VIEW ON testbench.* TO 'grantfail'@'%';"
-  #echo "MYSQL_USER=grantfail" >> "./test/envfile"
-  #mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
-  #mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
-  #echo "MYSQL_USER=grantfail" >> "./test/envfile"
-  #./backup.sh
-  #assertEquals 210 "$?"
-  #destroyTestData "withdata2"
-  #mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
-  #postTest
-#}
+testSkip_HasNot() {
+  export SKIP_OP=()
+  sourceCopy "hasSkip"
+  hasSkip "t"
+  assertEquals 0 "$?"
+  unset SKIP_OP
+}
+
+testSkip_Has() {
+  export SKIP_OP=("skip1")
+  sourceCopy "hasSkip"
+  hasSkip "skip1"
+  assertEquals 1 "$?"
+  unset SKIP_OP
+}
+
+testData_Fail() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'grantfail'@'%';"
+  echo "MYSQL_USER=grantfail" >> "./test/envfile"
+  echo "SKIP_OP=structure,routines,triggers,events,views,users,grants" >> "./test/envfile"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
+  ./backup.sh
+  assertEquals 208 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
+  postTest
+}
+
+testRoutines_Fail() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'grantfail'@'%';"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/function1.sql"
+  echo "MYSQL_USER=grantfail" >> "./test/envfile"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
+  echo "SKIP_OP=structure,data,triggers,events,views,users,grants" >> "./test/envfile"
+  ./backup.sh
+  assertEquals 209 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
+  postTest
+}
+
+testTriggers_Fail() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'grantfail'@'%';"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/trigger1.sql"
+  echo "MYSQL_USER=grantfail" >> "./test/envfile"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
+  echo "SKIP_OP=structure,data,routines,events,views,users,grants" >> "./test/envfile"
+  ./backup.sh
+  assertEquals 210 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
+  postTest
+}
+
+testGrantsList_Fail() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'userwd2gf'@'%';"
+  echo "MYSQL_USER=userwd2gf" >> "./test/envfile"
+  echo "SKIP_OP=structure,data,routines,events,triggers,users,views" >> "./test/envfile"
+  ./backup.sh
+  assertEquals 215 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/deleteuser.sql"
+  postTest
+}
+
+testGrants_Fail() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'userwd2gf'@'%';"
+  echo "MYSQL_USER=userwd2gf" >> "./test/envfile"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/grantToUsers.sql"
+  echo "SKIP_OP=structure,data,routines,events,triggers,users,views" >> "./test/envfile"
+  ./backup.sh
+  assertEquals 214 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/withdata2/deleteuser.sql"
+  postTest
+}
 
 testBACKUP_manualgrant_Success() {
   preTest
@@ -313,6 +365,7 @@ testBACKUP_manualgrant_Success() {
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToTestBench.sql"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
   mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT ALL PRIVILEGES ON mysql.* TO 'grantfail'@'%';"
   echo "MYSQL_USER=grantfail" >> "./test/envfile"
   ./backup.sh
   assertEquals 0 "$?"
@@ -321,4 +374,21 @@ testBACKUP_manualgrant_Success() {
   postTest
 }
 
+testNoSkipDatabases() {
+  preTest
+  createTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/createuser.sql"
+  mysql ${MYSQLCREDS} -ANe "GRANT INSERT ON testbench.* TO 'grantfail'@'%';"
+  echo "MYSQL_USER=grantfail" >> "./test/envfile"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToUsers.sql"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/grantToDB.sql"
+  echo "SKIP_OP=structure,data,routines,events,triggers,users,grants" >> "./test/envfile"
+  echo "SKIP_DATABASES=" >> "./test/envfile"
+  ./backup.sh
+  assertEquals 0 "$?"
+  destroyTestData "withdata2"
+  mysql ${MYSQLCREDS} < "${SCRIPT_ROOT}/samples/empty/deleteuser.sql"
+  postTest
+}
+
 . ./shunit2-2.1.7/shunit2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CREATE USER 'userwd2gf'@'%' IDENTIFIED BY 'testbench';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+USE testbench;`
	`2`	+CREATE DEFINER=`root`@`%` FUNCTION `procédure de test n°2`(`entrée 1` VARCHAR(35) CHARSET cp1250) RETURNS INT(1) UNSIGNED COMMENT "procédure de test n°2" NOT DETERMINISTIC NO SQL SQL SECURITY DEFINER RETURN 1;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+GRANT ALL PRIVILEGES ON mysql.db TO 'userwd2gf'@'%';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+GRANT ALL PRIVILEGES ON mysql.user TO 'userwd2gf'@'%';`