Merge pull request #6952 from adswa/bf-6950

BF: Remove duplicate key in result record
datalad · Aug 17, 2022 · 2c00733 · 2c00733
2 parents bacdc8e + 07c596f
commit 2c00733
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/datalad/distributed/create_sibling_ria.py b/datalad/distributed/create_sibling_ria.py
@@ -356,7 +356,6 @@ def __call__(url,
                         sname, dpath),
                     type='sibling',
                     name=sname,
-                    ds=ds,
                     **res_kwargs,
                 )
                 failed = True

diff --git a/datalad/distributed/tests/test_create_sibling_ria.py b/datalad/distributed/tests/test_create_sibling_ria.py
@@ -155,6 +155,11 @@ def _test_create_store(host, base_path=None, ds_path=None, clone_path=None):
                             status='ok',
                             action='get',
                             path=op.join(installed_ds.path, 'ds', 'file1.txt'))
+    # repeat the call to ensure it doesn't crash (see #6950)
+    res = ds.create_sibling_ria("ria+ssh://test-store:", "datastore", on_failure='ignore')
+    assert_result_count(res, 1, status='error', action='create-sibling-ria', message=(
+                        "a sibling %r is already configured in dataset %r",
+                        'datastore', ds.path))
 
     # now, again but recursive.
     res = ds.create_sibling_ria("ria+ssh://test-store:", "datastore",