Merge pull request #818 from effigies/fix/pathnames

FIX: Test names of paths when calling path.iterdir()

Author: effigies

niworkflows/interfaces/norm.py

@@ -169,7 +169,9 @@ def _get_settings(self):
         data_dir = load_data()
         # Get a list of settings files that match the flavor.
         filenames = [
-            i for i in data_dir.iterdir() if i.startswith(filestart) and i.endswith(".json")
+            path.name
+            for path in data_dir.iterdir()
+            if path.name.startswith(filestart) and path.name.endswith(".json")
         ]
         # Return the settings files.
         return [str(data_dir / f) for f in sorted(filenames)]

niworkflows/interfaces/tests/test_norm.py

@@ -0,0 +1,34 @@
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
+# vi: set ft=python sts=4 ts=4 sw=4 et:
+#
+# Copyright 2021 The NiPreps Developers <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# We support and encourage derived works from this project, please read
+# about our expectations at
+#
+#     https://www.nipreps.org/community/licensing/
+#
+from ..norm import SpatialNormalization
+
+
+def test_get_settings():
+    norm = SpatialNormalization(moving='T1w', flavor='fast')
+    settings = norm._get_settings()
+    assert len(settings) == 1
+    assert settings[0].split('/')[-1] == 't1w-mni_registration_fast_000.json'
+
+    norm = SpatialNormalization(moving='T1w', flavor='testing')
+    settings = norm._get_settings()
+    assert len(settings) == 3