WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests

This commit is contained in:
deajan 2016-09-05 22:25:25 +02:00
parent b79e26bcc6
commit 0df40f7964
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev/tests/run_tests.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# osync test suite 2016090501 # osync test suite 2016090502
# TODO: Add big fileset tests (eg: drupal 8 ?), add soft deletion tests, add deletion propagation test, add file attrib test # TODO: Add big fileset tests (eg: drupal 8 ?), add soft deletion tests, add deletion propagation test, add file attrib test
@ -53,16 +53,7 @@ function SetupSSH {
fi fi
} }
function oneTimeSetUp () { function setUp () {
source "$DEV_DIR/ofunctions.sh"
SetupSSH
}
function oneTimeTearDown () {
SetStableToOrigin
}
function SetUp () {
if [ -d "$INITIATOR_DIR" ]; then if [ -d "$INITIATOR_DIR" ]; then
rm -rf "$INITIATOR_DIR" rm -rf "$INITIATOR_DIR"
fi fi
@ -74,6 +65,15 @@ function SetUp () {
mkdir -p "$TARGET_DIR" mkdir -p "$TARGET_DIR"
} }
function oneTimeSetUp () {
source "$DEV_DIR/ofunctions.sh"
SetupSSH
}
function oneTimeTearDown () {
SetStableToOrigin
}
function test_Merge () { function test_Merge () {
cd "$DEV_DIR" cd "$DEV_DIR"
./merge.sh ./merge.sh
@ -96,7 +96,7 @@ function test_osync_quicksync_local () {
function test_osync_quicksync_remote () { function test_osync_quicksync_remote () {
cd "$OSYNC_DIR" cd "$OSYNC_DIR"
./$OSYNC_EXECUTABLE --initiator="$INITIATOR_DIR" --target="ssh://localhost:$SSH_PORT/$TARGET_DIR" --rsakey=/root/.ssh/id_rsa_local ./$OSYNC_EXECUTABLE --initiator="$INITIATOR_DIR" --target="ssh://localhost:$SSH_PORT/$TARGET_DIR" --rsakey="${HOME}/.ssh/id_rsa_local"
assertEquals "Return code" "0" $? assertEquals "Return code" "0" $?
[ -d "$INITIATOR_DIR/$OSYNC_STATE_DIR" ] [ -d "$INITIATOR_DIR/$OSYNC_STATE_DIR" ]