From aea0ea34066090af07252091e4e0ca0802177bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 28 Aug 2019 15:57:07 +0200
Subject: [PATCH] MAINT: clean up imports and remove depricated function
---
tests/test_misc.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 9656c5f..0816e07 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -26,13 +26,14 @@
@author: tf
"""
-import caosdb as db
-from caosdb import (Container, Info, Property, Record, RecordType,
- execute_query, get_connection)
from nose.tools import (assert_equal, assert_is_not_none, # @UnresolvedImport
- assert_not_equals, assert_raises, assert_true, nottest,
+ assert_not_equal, assert_raises, assert_true, nottest,
with_setup)
+import caosdb as db
+from caosdb import (Container, Info, Property, Record, RecordType,
+ execute_query)
+
def setup():
try:
@@ -278,10 +279,10 @@ def test_info():
assert_is_not_none(i.messages["Flags"])
assert_is_not_none(i.messages["Counts"])
assert_is_not_none(i.messages["TransactionBenchmark"])
- assert_not_equals('-1', i.messages["Counts"]["files"])
- assert_not_equals('-1', i.messages["Counts"]["records"])
- assert_not_equals('-1', i.messages["Counts"]["properties"])
- assert_not_equals('-1', i.messages["Counts"]["recordTypes"])
+ assert_not_equal('-1', i.messages["Counts"]["files"])
+ assert_not_equal('-1', i.messages["Counts"]["records"])
+ assert_not_equal('-1', i.messages["Counts"]["properties"])
+ assert_not_equal('-1', i.messages["Counts"]["recordTypes"])
assert_equal('true', i.messages["Counts"]["debug"])
# Not necessarily 0, all the temporary directories go here as well.
# assert_equal('0', i.messages["Counts"]["tmpfiles"])
--
GitLab