SSDM-7140: fixing tests

obis/src/python/obis/dm/data_mgmt_test.py

@@ -211,19 +211,19 @@ def test_undo_commit_when_sync_fails(tmpdir):
 
 
 def test_init_analysis(tmpdir):
-    dm = shared_dm(tmpdir)
-
     tmp_dir_path = str(tmpdir)
 
     with data_mgmt.cd(tmp_dir_path):
 
+        dm = shared_dm(tmp_dir_path)
+        prepare_registration_expectations(dm)
+        openbis = dm.openbis
+
         result = dm.init_data(tmp_dir_path, "test")
         assert result.returncode == 0
 
         copy_test_data(tmpdir)
 
-        dm = shared_dm(tmp_dir_path)
-        prepare_registration_expectations(dm)
         set_registration_configuration(dm)
 
         result = dm.commit("Added data.")
@@ -231,11 +231,17 @@ def test_init_analysis(tmpdir):
         parent_ds_code = dm.settings_resolver.config_dict()['repository']['data_set_id']
 
         analysis_repo = "analysis"
-        result = dm.init_analysis(analysis_repo, None)
-        assert result.returncode == 0
+        os.mkdir(analysis_repo)
 
         with data_mgmt.cd(analysis_repo):
 
+            dm = shared_dm(os.path.join(tmpdir, analysis_repo))
+            dm.openbis = openbis
+            prepare_new_data_set_expectations(dm)
+
+            result = dm.init_analysis("..")
+            assert result.returncode == 0
+
             set_registration_configuration(dm)
             prepare_new_data_set_expectations(dm)
             result = dm.commit("Analysis.")

obis/src/python/obis/dm/git.py

@@ -156,7 +156,7 @@ class GitRepoFileInfo(object):
 
     def file_list(self):
         tree = self.git_wrapper.git_ls_tree()
-        if tree.failure():
+        if tree.failure() or len(tree.output) == 0:
             return []
         lines = tree.output.split("\n")
         files = [line.split("\t")[-1].strip() for line in lines]