From 5f11372b8458c34094e516f28ab46109d287ccd5 Mon Sep 17 00:00:00 2001
From: Nell Hardcastle <nell@dev-nell.com>
Date: Mon, 3 Oct 2022 20:43:17 -0700
Subject: [PATCH] tests(worker): Set explicit 'directory': False values on
 non-annexed files

---
 services/datalad/tests/test_annex.py     |  5 +++--
 services/datalad/tests/test_files.py     | 10 +++++-----
 services/datalad/tests/test_snapshots.py |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/services/datalad/tests/test_annex.py b/services/datalad/tests/test_annex.py
index 68fde689c7..c369b5b967 100644
--- a/services/datalad/tests/test_annex.py
+++ b/services/datalad/tests/test_annex.py
@@ -42,7 +42,8 @@ def test_get_ls_tree_line():
             'id': '78dd92373749f62af23f3ae499b7a8ac33418fff',
             'key': 'a786c385bd1812410d01177affb6ce834d85facd',
             'urls': [],
-            'annexed': False}]
+            'annexed': False,
+            'directory': False}]
     assert symlinkFilenames == []
     assert symlinkObjects == []
 
@@ -135,4 +136,4 @@ def test_remote_url_encoding():
         "https://s3.amazonaws.com/openneuro.org/ds000248/derivatives/freesurfer/subjects/sub-01/mri/aparc+aseg.mgz?versionId=2Wx7w.fCYeGzGWLnW9sxWsPdztl.2HL0") == "https://s3.amazonaws.com/openneuro.org/ds000248/derivatives/freesurfer/subjects/sub-01/mri/aparc%2Baseg.mgz?versionId=2Wx7w.fCYeGzGWLnW9sxWsPdztl.2HL0"
     assert encode_remote_url(
         "https://s3.amazonaws.com/openneuro.org/ds000248/sub-01/anat/sub-01_T1w.nii.gz?versionId=8uTXIQ10Blcp2GeAVJJCHL5PimkSaQZL") == "https://s3.amazonaws.com/openneuro.org/ds000248/sub-01/anat/sub-01_T1w.nii.gz?versionId=8uTXIQ10Blcp2GeAVJJCHL5PimkSaQZL"
-    assert encode_remote_url("=") == '='
\ No newline at end of file
+    assert encode_remote_url("=") == '='
diff --git a/services/datalad/tests/test_files.py b/services/datalad/tests/test_files.py
index 3823287934..17ecb3e6a5 100644
--- a/services/datalad/tests/test_files.py
+++ b/services/datalad/tests/test_files.py
@@ -129,11 +129,11 @@ def test_file_indexing(client, new_dataset):
         {'filename': 'dataset_description.json', 'size': 101,
             'id': '43502da40903d08b18b533f8897330badd6e1da3',
             'key': '838d19644b3296cf32637bbdf9ae5c87db34842f',
-            'urls': [], 'annexed': False},
+            'urls': [], 'annexed': False, 'directory': False},
         {'filename': 'LICENSE', 'size': 8,
             'id': '8a6f5281317d8a8fb695d12c940b0ff7a7dee435',
             'key': 'MD5E-s8--4d87586dfb83dc4a5d15c6cfa6f61e27',
-            'urls': [], 'annexed': True},
+            'urls': [], 'annexed': True, 'directory': False},
         {'id': '2f8451ae1016f936999aaacc0b3d79fb284ac3ea', 'filename': 'sub-01',
             'directory': True, 'annexed': False, 'size': 0, 'urls': []}
     ]:
@@ -154,7 +154,7 @@ def test_file_indexing(client, new_dataset):
     assert {'filename': 'sub-01_T1w.nii.gz', 'size': 19,
             'id': 'e497096a2bce0d48b2761dade2b5c4e5a0f352bd',
             'key': 'MD5E-s19--8149926e49b677a5ccecf1ad565acccf.nii.gz',
-            'urls': [], 'annexed': True} in anat_content['files']
+            'urls': [], 'annexed': True, 'directory': False} in anat_content['files']
 
 
 def test_empty_file(client, new_dataset):
@@ -175,10 +175,10 @@ def test_empty_file(client, new_dataset):
     # Check that all elements exist in both lists
     assert({'filename': 'LICENSE',
             'size': 0, 'id': '5bfdc52581371bfa051fa76825a0e1b5e5c3b4bf',
-            'key': 'MD5E-s0--d41d8cd98f00b204e9800998ecf8427e', 'urls': [], 'annexed': True} in response_content['files'])
+            'key': 'MD5E-s0--d41d8cd98f00b204e9800998ecf8427e', 'urls': [], 'annexed': True, 'directory': False} in response_content['files'])
     assert({'filename': 'dataset_description.json',
             'size': 101, 'id': '43502da40903d08b18b533f8897330badd6e1da3',
-            'key': '838d19644b3296cf32637bbdf9ae5c87db34842f', 'urls': [], 'annexed': False} in response_content['files'])
+            'key': '838d19644b3296cf32637bbdf9ae5c87db34842f', 'urls': [], 'annexed': False, 'directory': False} in response_content['files'])
 
 
 def test_duplicate_file_id(client, new_dataset):
diff --git a/services/datalad/tests/test_snapshots.py b/services/datalad/tests/test_snapshots.py
index e767e99d4c..ec38325035 100644
--- a/services/datalad/tests/test_snapshots.py
+++ b/services/datalad/tests/test_snapshots.py
@@ -20,10 +20,10 @@ def test_get_snapshot(client):
     assert result_doc['files'] == [
         {'filename': 'CHANGES', 'size': 41, 'id': '0daaa69260ab1f1fa8cfd0e17a4c1993d6d46e54',
          'key': '63f4f8294caf64dccfedcb5300dee70e3fe3a7c5', 'urls': [],
-         'annexed': False},
+         'annexed': False, 'directory': False},
         {'filename': 'dataset_description.json', 'size': 97, 'id': '9c946a75b4c24c14e65d746b2ff295a904845aa3',
          'key': '85b9ddf2bfaf1d9300d612dc29774a98cc1d5e25', 'urls': [],
-         'annexed': False}
+         'annexed': False, 'directory': False}
     ]
     assert result_doc['tag'] == SNAPSHOT_ID
     assert result_doc['id'] == '{}:{}'.format(DATASET_ID, SNAPSHOT_ID)