Skip to content
Snippets Groups Projects
Commit 4ff48b20 authored by yvesn's avatar yvesn
Browse files

SSDM-6476: fixing tests

parent 691d06d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/python/OBis/obis/dm/data_mgmt_test.py
+ 6
− 6
View file @ 4ff48b20
...@@ -142,7 +142,7 @@ def test_child_data_set(tmpdir): ...@@ -142,7 +142,7 @@ def test_child_data_set(tmpdir):
result = dm.commit("Added data.") result = dm.commit("Added data.")
assert result.returncode == 0 assert result.returncode == 0
parent_ds_code = dm.settings_resolver.config_dict()['data_set_id'] parent_ds_code = dm.settings_resolver.config_dict()['repository']['data_set_id']
update_test_data(tmpdir) update_test_data(tmpdir)
properties = {'DESCRIPTION': 'Updated content.'} properties = {'DESCRIPTION': 'Updated content.'}
...@@ -150,10 +150,10 @@ def test_child_data_set(tmpdir): ...@@ -150,10 +150,10 @@ def test_child_data_set(tmpdir):
prepare_new_data_set_expectations(dm, properties) prepare_new_data_set_expectations(dm, properties)
result = dm.commit("Updated data.") result = dm.commit("Updated data.")
assert result.returncode == 0 assert result.returncode == 0
child_ds_code = dm.settings_resolver.config_dict()['data_set_id'] child_ds_code = dm.settings_resolver.config_dict()['repository']['data_set_id']
assert parent_ds_code != child_ds_code assert parent_ds_code != child_ds_code
commit_id = dm.git_wrapper.git_commit_hash().output commit_id = dm.git_wrapper.git_commit_hash().output
repository_id = dm.settings_resolver.config_dict()['repository_id'] repository_id = dm.settings_resolver.config_dict()['repository']['repository_id']
assert repository_id is not None assert repository_id is not None
contents = git.GitRepoFileInfo(dm.git_wrapper).contents(git_annex_hash_as_checksum=True) contents = git.GitRepoFileInfo(dm.git_wrapper).contents(git_annex_hash_as_checksum=True)
...@@ -215,7 +215,7 @@ def test_init_analysis(tmpdir): ...@@ -215,7 +215,7 @@ def test_init_analysis(tmpdir):
result = dm.commit("Added data.") result = dm.commit("Added data.")
assert result.returncode == 0 assert result.returncode == 0
parent_ds_code = dm.settings_resolver.config_dict()['data_set_id'] parent_ds_code = dm.settings_resolver.config_dict()['repository']['data_set_id']
analysis_repo = "analysis" analysis_repo = "analysis"
result = dm.init_analysis(analysis_repo, None) result = dm.init_analysis(analysis_repo, None)
...@@ -227,10 +227,10 @@ def test_init_analysis(tmpdir): ...@@ -227,10 +227,10 @@ def test_init_analysis(tmpdir):
prepare_new_data_set_expectations(dm) prepare_new_data_set_expectations(dm)
result = dm.commit("Analysis.") result = dm.commit("Analysis.")
assert result.returncode == 0 assert result.returncode == 0
child_ds_code = dm.settings_resolver.config_dict()['data_set_id'] child_ds_code = dm.settings_resolver.config_dict()['repository']['data_set_id']
assert parent_ds_code != child_ds_code assert parent_ds_code != child_ds_code
commit_id = dm.git_wrapper.git_commit_hash().output commit_id = dm.git_wrapper.git_commit_hash().output
repository_id = dm.settings_resolver.config_dict()['repository_id'] repository_id = dm.settings_resolver.config_dict()['repository']['repository_id']
assert repository_id is not None assert repository_id is not None
contents = git.GitRepoFileInfo(dm.git_wrapper).contents(git_annex_hash_as_checksum=True) contents = git.GitRepoFileInfo(dm.git_wrapper).contents(git_annex_hash_as_checksum=True)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment