Skip to content
Snippets Groups Projects
Verified Commit 97a8dc35 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

fix merge

parent 6e644fa5
No related branches found
No related tags found
2 merge requests!50Draft: ENH: file system: core,!8Draft: F filesystem
Pipeline #7895 canceled
......@@ -301,14 +301,9 @@ def test_file7():
path="testfiles2/",
pickup="testfolder")
<<<<<<< HEAD
with raises(EntityError):
folder_.insert()
=======
with raises(TransactionError) as te:
folder_.insert()
assert te.value.has_error(EntityError)
>>>>>>> dev
finally:
try:
shutil.rmtree(path)
......@@ -448,7 +443,8 @@ def test_consistency_unknown_file():
# which simulates an unknown file.
c = runCheck(None, "-c UNKNOWN_FILE")
assert c.messages["Warning", 0] is not None
assert c.messages["Warning", 0][0] == 'debug/test_file_storage_consistency: Unknown file.'
assert c.messages["Warning",
0][0] == 'debug/test_file_storage_consistency: Unknown file.'
c = runCheck(None, None)
assert c.messages["Info", 0] is not None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment