X-Git-Url: http://git.scottworley.com/annex-ec/blobdiff_plain/10cf2a1e0480ffc7f70bfe8eb1f427b9f98efccf..fe6bf209a525eb54b1124271ee5063a3de44072b:/annex-ec-test

diff --git a/annex-ec-test b/annex-ec-test
index 20363f8..3ba2006 100755
--- a/annex-ec-test
+++ b/annex-ec-test
@@ -55,7 +55,9 @@ fsck_everything() {
     for already_deleted in "${deleted_vols[@]}";do
       if [[ "$vol" == "$already_deleted" ]];then continue 2; fi
     done
-    git -C "$(vol_dir "$vol")" annex fsck
+    pushd "$(vol_dir "$vol")"
+      git annex fsck -- *-*
+    popd
   done
 }
 
@@ -107,13 +109,24 @@ make_test_file() {
   echo "$f"
 }
 
-choose_volumes() {
+some_random_volume_names() {
   x=$(for vol in "${vols[@]}";do
         vol_name "$vol"
       done | shuf | head -n "$1" | tr \\n ,)
   echo "${x%,}"
 }
 
+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
+    vol_dir "$vol"
+    break
+  done
+}
+
 MIN_REDUNDANCY=1
 MIN_FILES=2 # If you only have one file in a group, you'd just make copies of it, no need for annex-ec
 MIN_VOLUMES=$((MIN_REDUNDANCY + MIN_FILES))
@@ -129,17 +142,23 @@ for (( num_vols=MIN_VOLUMES; num_vols <= 10; num_vols++ ));do
       done
       sync_everything
       sync_everything
-      pushd "$(vol_dir "${vols[$RANDOM % $num_vols]}")"
-        cmd=(annex-ec -r "$redundancy" -v "$(choose_volumes $((num_files+redundancy)))" "${files[@]}")
+      pushd "$(a_random_volume_dir)"
+        cmd=(annex-ec -r "$redundancy" -v "$(some_random_volume_names $((num_files+redundancy)))" "${files[@]}")
         echo "In $PWD , running ${cmd[*]}" >&2
         "${cmd[@]}"
       popd
       sync_everything
+      sync_everything
       fsck_everything
+
       delete_some_test_vols "$redundancy"
-      # TODO: Recover
+      pushd "$(a_random_volume_dir)"
+        annex-ec-recover -- *-*
+      popd
+
+      sync_everything
       sync_everything
-      # fsck_everything # Skip this check until recovery is implemented
+      fsck_everything
       delete_all_test_vols
     done
   done