From f2a039a627e0d0232933a913da439469d19795b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 31 Dec 2019 11:11:12 +0100
Subject: [PATCH] STY: ws
---
tests/test_file.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/test_file.py b/tests/test_file.py
index d1bc6bc..a4867a0 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",
--
GitLab