tests: Factor out has_been_deleted()

[annex-ec] / annex-ec-test

diff --git a/annex-ec-test b/annex-ec-test
index 3ba2006cc2dfa72b055749aecbba885435190c90..9858db1155decb0f994a6a1ae9096b45989bcf89 100755 (executable)
--- a/annex-ec-test
+++ b/annex-ec-test
@@ -41,20 +41,23 @@ make_test_vols() {
   sync_everything
 }
 
+has_been_deleted() {
+  for already_deleted in "${deleted_vols[@]}";do
+    if [[ "$1" == "$already_deleted" ]];then return 0; fi
+  done
+  return 1
+}
+
 sync_everything() {
   for vol in "${vols[@]}";do
-    for already_deleted in "${deleted_vols[@]}";do
-      if [[ "$vol" == "$already_deleted" ]];then continue 2; fi
-    done
+    if has_been_deleted "$vol";then continue; fi
     git -C "$(vol_dir "$vol")" annex sync
   done
 }
 
 fsck_everything() {
   for vol in "${vols[@]}";do
-    for already_deleted in "${deleted_vols[@]}";do
-      if [[ "$vol" == "$already_deleted" ]];then continue 2; fi
-    done
+    if has_been_deleted "$vol";then continue; fi
     pushd "$(vol_dir "$vol")"
       git annex fsck -- *-*
     popd
@@ -62,9 +65,7 @@ fsck_everything() {
 }
 
 delete_test_vol() {
-  for already_deleted in "${deleted_vols[@]}";do
-    if [[ "$1" == "$already_deleted" ]];then return; fi
-  done
+  if has_been_deleted "$vol";then return; fi
   d="$(vol_dir "$1")"
   if [[ -d "$d/.git/annex/objects" ]];then
     chmod -R +w "$d/.git/annex/objects"
@@ -74,9 +75,7 @@ delete_test_vol() {
 
   # Find a not-yet-deleted volume (if there is one) and report the deleted volume as dead
   for vol in "${vols[@]}";do
-    for already_deleted in "${deleted_vols[@]}";do
-      if [[ "$vol" == "$already_deleted" ]];then continue 2; fi
-    done
+    if has_been_deleted "$vol";then continue; fi
     git -C "$(vol_dir "$vol")" annex dead "$(vol_name "$1")"
     break
   done
@@ -119,9 +118,7 @@ some_random_volume_names() {
 a_random_volume_dir() {
   while true;do
     vol="${vols[$RANDOM % $num_vols]}"
-    for already_deleted in "${deleted_vols[@]}";do
-      if [[ "$vol" == "$already_deleted" ]];then continue 2; fi
-    done
+    if has_been_deleted "$vol";then continue; fi
     vol_dir "$vol"
     break
   done
@@ -132,7 +129,7 @@ MIN_FILES=2 # If you only have one file in a group, you'd just make copies of it
 MIN_VOLUMES=$((MIN_REDUNDANCY + MIN_FILES))
 
 for (( num_vols=MIN_VOLUMES; num_vols <= 10; num_vols++ ));do
-  for (( redundancy=1; redundancy < num_vols-2; redundancy++ ));do
+  for (( redundancy=1; redundancy <= num_vols-2; redundancy++ ));do
     max_files=$(( num_vols - redundancy ))
     for (( num_files=MIN_FILES; num_files <= max_files; num_files++ ));do
       make_test_vols "$num_vols"