reverted unnecessary changes

tests/test_file.py

@@ -169,7 +169,6 @@ def test_file4():
             pass
 
 
-@mark.xfail(reason="refactoring filesystem")
 def test_upload_complete_folder():
     file1_ = models.File(name="Testfile1",
                          description="Testfile Desc",
@@ -200,7 +199,6 @@ def test_upload_complete_folder():
     c.delete()
 
 
-@mark.xfail(reason="refactoring filesystem")
 def test_file6():
     try:
         # upload file to testfiles2/testfile...
@@ -309,7 +307,6 @@ def test_file7():
             pass
 
 
-@mark.xfail(reason="refactoring filesystem")
 def test_consistency_file_was_modified():
     try:
 
@@ -375,7 +372,6 @@ def test_consistency_file_was_modified():
             pass
 
 
-@mark.xfail(reason="refactoring filesystem")
 def test_consistency_file_does_not_exist():
     try:
         with open("test.dat", "w") as upload_file:

tests/test_issues_server.py

@@ -24,7 +24,6 @@
 
 """Tests for issues on gitlab.com, project caosdb-server."""
 
-from pytest import mark
 import os
 import tempfile
 import time
@@ -99,7 +98,6 @@ def test_issue_62():
         prop2.insert()
 
 
-@mark.xfail(reason="waiting for fix")
 def test_issue_85_a():
     """SQLIntegrityConstraintViolationException for special inheritance patterns.
 
@@ -123,7 +121,7 @@ def test_issue_85_a():
     c.insert()  # Raised java.sql.SQLIntegrityConstraintViolationException:
     #           # Duplicate entry '12345-12346-12345' for key 'PRIMARY'
 
-@mark.xfail(reason="waiting for fix")
+
 def test_issue_85_b():
     """SQLIntegrityConstraintViolationException for special inheritance patterns.
 
@@ -145,6 +143,7 @@ def test_issue_85_b():
     C.update()  # Failed at this step
 
 
+@pytest.mark.xfail(reason="filesystem refactoring")
 def test_issue_99():
     """Checksum updating failed with versioning enabled.
     """