From e6be72f5a84e721eeabdfef6c5bafd6c45c238fb Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 30 Aug 2016 19:17:14 +0200 Subject: [PATCH] Removed debug line --- dev/tests/run_local_tests.sh | 17 +++++++++-------- dev/tests/run_travis_tests.sh | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/tests/run_local_tests.sh b/dev/tests/run_local_tests.sh index 1404c2c..46f1180 100755 --- a/dev/tests/run_local_tests.sh +++ b/dev/tests/run_local_tests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## obackup test suite 2016083002 +## obackup test suite 2016083003 # Stupid and very basic tests v0.0000003-alpha-dev-pre-everything OBACKUP_DIR="$(pwd)" @@ -13,14 +13,14 @@ OBACKUP_EXECUTABLE=obackup.sh SOURCE_DIR="${HOME}/obackup-testdata" TARGET_DIR="${HOME}/obackup-storage" -TARGET_DIR_SQL_LOCAL="${HOME}/obackup-storage/sql" -TARGET_DIR_FILE_LOCAL="${HOME}/obackup-storage/files" +TARGET_DIR_SQL_LOCAL="$TARGET_DIR/sql" +TARGET_DIR_FILE_LOCAL="$TARGET_DIR/files" -TARGET_DIR_SQL_PULL="${HOME}/obackup-storage/sql-pull" -TARGET_DIR_FILE_PULL="${HOME}/obackup-storage/files-pull" +TARGET_DIR_SQL_PULL="$TARGET_DIR/sql-pull" +TARGET_DIR_FILE_PULL="$TARGET_DIR/files-pull" -TARGET_DIR_SQL_PUSH="${HOME}/obackup-storage/sql-push" -TARGET_DIR_FILE_PUSH="${HOME}/obackup-storage/files-push" +TARGET_DIR_SQL_PUSH="$TARGET_DIR/sql-push" +TARGET_DIR_FILE_PUSH="$TARGET_DIR/files-push" SIMPLE_DIR="testData" RECURSIVE_DIR="testDataRecursive" @@ -154,8 +154,9 @@ function test_SecondLocalRun () { done [ -d "$TARGET_DIR_FILE_LOCAL/$(dirname $SOURCE_DIR).obackup.1" ] - assertEquals "File rotated Presence" "0" $? + assertEquals "File rotated Presence [$TARGET_DIR_FILE_LOCAL/$(dirname $SOURCE_DIR).obackup.1]" "0" $? } + function test_FirstPullRun () { # Basic return code tests. Need to go deep into file presence testing cd "$OBACKUP_DIR" diff --git a/dev/tests/run_travis_tests.sh b/dev/tests/run_travis_tests.sh index 2621c41..7440a1e 100755 --- a/dev/tests/run_travis_tests.sh +++ b/dev/tests/run_travis_tests.sh @@ -155,7 +155,6 @@ function test_SecondLocalRun () { [ -d "$TARGET_DIR_FILE_LOCAL/$(dirname $SOURCE_DIR).obackup.1" ] assertEquals "File rotated Presence [$TARGET_DIR_FILE_LOCAL/$(dirname $SOURCE_DIR).obackup.1]" "0" $? - ls $TARGET_DIR_FILE_LOCAL -alh } function test_WaitForTaskCompletion () {