From 97a8dc350c2d74799fd000a473012c45ea0e14cb Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 27 May 2021 12:28:15 +0200
Subject: [PATCH] fix merge
---
tests/test_file.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/tests/test_file.py b/tests/test_file.py
index f34c81f..c830f1e 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -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
--
GitLab