diff --git a/tests/test_file.py b/tests/test_file.py index d1bc6bc0c9993ee23ab83b853692c205a21815b3..a4867a08ed3b09758aa0229bc539eca391064d8c 100644 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -33,15 +33,16 @@ from random import randint from sys import maxsize as maxint from lxml import etree -from nose.tools import (assert_equal, assert_false, # @UnresolvedImport - assert_is_not_none, assert_raises, assert_true, - nottest, with_setup) -from caosdb import execute_query, get_config, get_connection, Info +from caosdb import Info +from caosdb import administration as admin +from caosdb import execute_query, get_config, get_connection from caosdb.common import models from caosdb.exceptions import EntityError from caosdb.utils.checkFileSystemConsistency import runCheck -from caosdb import administration as admin +from nose.tools import (assert_equal, assert_false, # @UnresolvedImport + assert_is_not_none, assert_raises, assert_true, + nottest, with_setup) def setup_module(): @@ -701,10 +702,10 @@ def test_insert_files_in_dir_regex(): "InsertFilesInDir": "-e test " + path_on_server}) assert c.messages["Warning", 2] is not None - assert c.messages["Warning", 2][0] == "Explicitly excluded directory or file: {}".format(path_on_server[:-1]) + assert c.messages["Warning", 2][0] == "Explicitly excluded directory or file: {}".format( + path_on_server[:-1]) assert len(c) == 0 - finally: try: c.delete() @@ -716,7 +717,6 @@ def test_insert_files_in_dir_regex(): pass - @with_setup(setup, teardown) def test_thumbnails(): file_ = models.File(name="TestFile",