Merge pull request #3497 from CliMA/ck/repro_fixes2

Apply more reproducibility test infra fixes

Author: charleskawczynski

reproducibility_tests/move_output.jl

@@ -17,7 +17,12 @@ move_data_to_save_dir(;
 
 if buildkite_ci && in_merge_queue
     folders = get_reference_dirs_to_delete(; root_dir = cluster_data_prefix)
-    debug_reproducibility() && @warn "Repro: deleting folders $folders"
+    bins = compute_bins(folders)
+    if !isempty(folders)
+        msg = prod(x -> "    $x\n", folders)
+        @warn "Repro: deleting folders:\n$msg"
+    end
+    @warn "Deleted folder bins:\n $(string_bins(bins))"
     for f in folders
         rm(f; recursive = true, force = true)
     end

reproducibility_tests/ref_counter.jl

@@ -1,4 +1,4 @@
-192
+193
 
 # **README**
 #
@@ -21,6 +21,9 @@
 
 #=
 
+193
+- More reproducibility infrastructure fixes.
+
 192
 - Reproducibility infrastructure fixes.
 

reproducibility_tests/reproducibility_tools.jl

@@ -27,16 +27,6 @@ function error_if_dissimilar_dicts(dicts, dict)
     end
 end
 
-function all_files_in_dir(dir)
-    all_files = String[]
-    for (root, dirs, files) in walkdir(dir)
-        for file in files
-            push!(all_files, joinpath(root, file))
-        end
-    end
-    return all_files
-end
-
 function no_comparison_error(dirs, non_existent_files)
     msg = "\n\n"
     msg *= "Pull request author:\n"
@@ -59,7 +49,10 @@ function no_comparison_error(dirs, non_existent_files)
     msg *= "for how to merge this PR."
     msg *= "\n\n"
     for dir in dirs
-        msg *= "Files in dirs: $(all_files_in_dir(dir))\n"
+        msg *= "Files in dir $dir\n"
+        for file in all_files_in_dir(dir)
+            msg *= "     $file\n"
+        end
     end
     error(msg)
 end