Merge pull request jimsalterjrs#904 from phreaker0/tests-restructure

test adaptions
Deltik · Apr 22, 2024 · 1207ea0 · 1207ea0
2 parents d800e5e + 4e86733
commit 1207ea0
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 4 deletions.
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
@@ -17,8 +17,11 @@ for test in $(find . -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort -g);
     cd "${test}"
     echo -n y | bash run.sh > "${LOGFILE}" 2>&1
 
-    if [ $? -eq 0 ]; then
+    ret=$?
+    if [ $ret -eq 0 ]; then
         echo "[PASS]"
+    elif [ $ret -eq 130 ]; then
+        echo "[SKIPPED]"
     else
         echo "[FAILED] (see ${LOGFILE})"
     fi

diff --git a/..._bookmark_replication_intermediate/run.sh → ..._bookmark_replication_intermediate/run.sh b/..._bookmark_replication_intermediate/run.sh → ..._bookmark_replication_intermediate/run.sh
diff --git a/...okmark_replication_no_intermediate/run.sh → ...okmark_replication_no_intermediate/run.sh b/...okmark_replication_no_intermediate/run.sh → ...okmark_replication_no_intermediate/run.sh
diff --git a/tests/syncoid/3_force_delete/run.sh → tests/syncoid/003_force_delete/run.sh b/tests/syncoid/3_force_delete/run.sh → tests/syncoid/003_force_delete/run.sh
diff --git a/...d/4_bookmark_replication_edge_case/run.sh → ...004_bookmark_replication_edge_case/run.sh b/...d/4_bookmark_replication_edge_case/run.sh → ...004_bookmark_replication_edge_case/run.sh
diff --git a/tests/syncoid/5_reset_resume_state/run.sh → tests/syncoid/005_reset_resume_state/run.sh b/tests/syncoid/5_reset_resume_state/run.sh → tests/syncoid/005_reset_resume_state/run.sh
@@ -28,6 +28,8 @@ zfs create -o mountpoint="${MOUNT_TARGET}" "${POOL_NAME}"/src
 
 dd if=/dev/urandom of="${MOUNT_TARGET}"/big_file bs=1M count=200
 
+sleep 1
+
 ../../../syncoid --debug --compress=none --source-bwlimit=2m "${POOL_NAME}"/src "${POOL_NAME}"/dst &
 syncoid_pid=$!
 sleep 5

diff --git a/tests/syncoid/6_reset_resume_state2/run.sh → tests/syncoid/006_reset_resume_state2/run.sh b/tests/syncoid/6_reset_resume_state2/run.sh → tests/syncoid/006_reset_resume_state2/run.sh
@@ -28,6 +28,8 @@ zfs create -o mountpoint="${MOUNT_TARGET}" "${POOL_NAME}"/src
 
 dd if=/dev/urandom of="${MOUNT_TARGET}"/big_file bs=1M count=200
 
+sleep 1
+
 zfs snapshot "${POOL_NAME}"/src@big
 ../../../syncoid --debug --no-sync-snap --compress=none --source-bwlimit=2m "${POOL_NAME}"/src "${POOL_NAME}"/dst &
 syncoid_pid=$!

diff --git a/tests/syncoid/7_preserve_recordsize/run.sh → tests/syncoid/007_preserve_recordsize/run.sh b/tests/syncoid/7_preserve_recordsize/run.sh → tests/syncoid/007_preserve_recordsize/run.sh
diff --git a/tests/syncoid/8_force_delete_snapshot/run.sh → .../syncoid/008_force_delete_snapshot/run.sh b/tests/syncoid/8_force_delete_snapshot/run.sh → .../syncoid/008_force_delete_snapshot/run.sh
diff --git a/tests/syncoid/9_preserve_properties/run.sh → tests/syncoid/009_preserve_properties/run.sh b/tests/syncoid/9_preserve_properties/run.sh → tests/syncoid/009_preserve_properties/run.sh
diff --git a/tests/syncoid/10_filter_snaps/run.sh → tests/syncoid/010_filter_snaps/run.sh b/tests/syncoid/10_filter_snaps/run.sh → tests/syncoid/010_filter_snaps/run.sh
diff --git a/...id/815_sync_out-of-order_snapshots/run.sh → ...id/011_sync_out-of-order_snapshots/run.sh b/...id/815_sync_out-of-order_snapshots/run.sh → ...id/011_sync_out-of-order_snapshots/run.sh
@@ -7,9 +7,13 @@ set -e
 
 . ../../common/lib.sh
 
-POOL_IMAGE="/tmp/jimsalterjrs_sanoid_815.img"
+if [ -z "$ALLOW_INVASIVE_TESTS" ]; then
+  exit 130
+fi
+
+POOL_IMAGE="/tmp/syncoid-test-11.zpool"
 POOL_SIZE="64M"
-POOL_NAME="jimsalterjrs_sanoid_815"
+POOL_NAME="syncoid-test-11"
 
 truncate -s "${POOL_SIZE}" "${POOL_IMAGE}"
 

diff --git a/tests/syncoid/run-tests.sh b/tests/syncoid/run-tests.sh
@@ -17,8 +17,11 @@ for test in $(find . -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort -g);
     cd "${test}"
     echo | bash run.sh > "${LOGFILE}" 2>&1
 
-    if [ $? -eq 0 ]; then
+    ret=$?
+    if [ $ret -eq 0 ]; then
         echo "[PASS]"
+    elif [ $ret -eq 130 ]; then
+        echo "[SKIPPED]"
     else
         echo "[FAILED] (see ${LOGFILE})"
     fi