WIP: file storage refactoring: import

tests/test_file.py

@@ -319,7 +319,6 @@ def test_import_checksum_mismatch():
     path = get_config().get("IntegrationTests",
                             "test_files.test_import_files_in_dir.local") + "testfolder/"
 
-    try:
     os.makedirs(path)
     os.makedirs(path + "subfolder/")
     local_file = os.path.join(path, "subfolder", "some_data.csv")
@@ -336,12 +335,6 @@ def test_import_checksum_mismatch():
     errors = cm.entity.get_errors()
     assert errors[0].description == 'Checksum test failed. File is corrupted.'
 
-    finally:
-        try:
-            shutil.rmtree(path)
-        except BaseException:
-            pass
-
 
 def test_import_existing():
     path = get_config().get("IntegrationTests",
@@ -398,7 +391,6 @@ def test_import_directoy():
     path = get_config().get("IntegrationTests",
                             "test_files.test_import_files_in_dir.local") + "testfolder/"
 
-    try:
     os.makedirs(path)
     os.makedirs(path + "subfolder/")
     with open(path + "subfolder/some_data.csv", "w") as test_file1:
@@ -413,19 +405,11 @@ def test_import_directoy():
     assert re.role == "Directory"
     assert re.path == "/testfolder/subfolder"
 
-    finally:
-        try:
-            shutil.rmtree(path)
-        except BaseException:
-            pass
-
 
-@mark.xfail(reason="Wait for implementation in the server")
 def test_import_directoy_recursively():
     path = get_config().get("IntegrationTests",
                             "test_files.test_import_files_in_dir.local") + "testfolder/"
 
-    try:
     os.makedirs(path)
     os.makedirs(path + "subfolder/")
     with open(path + "subfolder/some_data.csv", "w") as test_file1:
@@ -453,12 +437,6 @@ def test_import_directoy_recursively():
             assert e.role == "File"
             assert e.path == "testfolder/subfolder/some_data.csv"
 
-    finally:
-        try:
-            shutil.rmtree(path)
-        except BaseException:
-            pass
-
 
 def test_consistency_file_was_modified_2():
     # this test is different from test_consistency_file_was_modified in that