utils: sort dirs upon hash calculation

audrium · Nov 23, 2020 · 24fd766 · 24fd766
1 parent a48dcd8
commit 24fd766
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/reana_commons/utils.py b/reana_commons/utils.py
@@ -65,8 +65,9 @@ def calculate_hash_of_dir(directory, file_list=None):
     if not os.path.exists(directory):
         return -1
 
+    sorted_by_dirs = sorted(list(os.walk(directory)), key=lambda x: x[2])
     try:
-        for subdir, dirs, files in os.walk(directory):
+        for subdir, dirs, files in sorted_by_dirs:
             for _file in files:
                 file_path = os.path.join(subdir, _file)
                 if file_list is not None and file_path not in file_list:

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -67,7 +67,7 @@ def test_calculate_hash_of_dir(sample_workflow_workspace):  # noqa: F811
     assert non_existing_dir_hash == -1
     sample_workflow_workspace_path = next(sample_workflow_workspace("sample"))
     dir_hash = calculate_hash_of_dir(sample_workflow_workspace_path)
-    assert dir_hash == "8d287a3e2240b1762862d485a424363c"
+    assert dir_hash == "cb2669b4d7651aa717b6952fce85575f"
     include_only_path = os.path.join(
         sample_workflow_workspace_path, "code", "worldpopulation.ipynb"
     )