From 35558cf48c5df8fff699ad497de80d72ccca093e Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 30 Aug 2016 16:24:30 +0200 Subject: [PATCH] Added merge test --- dev/tests/run_travis_tests.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev/tests/run_travis_tests.sh b/dev/tests/run_travis_tests.sh index 1c1b7f9..e157cd1 100755 --- a/dev/tests/run_travis_tests.sh +++ b/dev/tests/run_travis_tests.sh @@ -43,7 +43,7 @@ DATABASE_EXCLUDED="information_schema.sql.xz" function oneTimeSetUp () { source "$DEV_DIR/ofunctions.sh" - if grep "^IS_STABLE=YES" "$DEV_DIR/n_obackup.sh" > /dev/null; then + if grep "^IS_STABLE=YES" "$DEV_DIR/n_obackup.sh"; then IS_STABLE=yes else IS_STABLE=no @@ -100,10 +100,16 @@ function oneTimeTearDown () { } +function test_Merge () { + cd "$DEV_DIR" + ./merge.sh + asserEquals "Merging" "0" $? +} + function test_FirstLocalRun () { # Basic return code tests. Need to go deep into file presence testing - cd "$DEV_DIR" - ./n_obackup.sh tests/conf/local.conf > /dev/null + cd "$OBACKUP_DIR" + ./obackup.sh dev/tests/conf/local.conf assertEquals "Return code" "0" $? for file in "${FilePresence[@]}"; do @@ -134,8 +140,8 @@ function test_FirstLocalRun () { function test_SecondLocalRun () { # Only tests presence of rotated files - cd "$DEV_DIR" - ./n_obackup.sh tests/conf/local.conf > /dev/null + cd "$OBACKUP_DIR" + ./obackup.sh dev/tests/conf/local.conf > /dev/null assertEquals "Return code" "0" $? for file in "${DatabasePresence[@]}"; do