diff --git a/tests/test_messages.py b/tests/test_messages.py index 79430422d37000700454d1d70b97fbf353f733dc..ae0d157ea81ef4666b4046bc9e2a7abeb8cd09a4 100644 --- a/tests/test_messages.py +++ b/tests/test_messages.py @@ -26,7 +26,7 @@ @author: Timm Fitschen """ -import caosdb as db +import linkahead as db def test_messages_dict_behavior(): diff --git a/tests/test_permissions.py b/tests/test_permissions.py index fafc70db1a8fb97c63c2ba875e08f7eeb6768afa..da4a549085e20cad74028434a78eb729806d58a4 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -28,12 +28,20 @@ from __future__ import absolute_import -import caosdb as db -from nose.tools import (assert_equal, - assert_raises, - assert_false, - assert_is_none, - assert_is_not_none) +import linkahead as db + +def assert_equal(a, b): + assert a == b + +def assert_is_not_none(a): + assert a is not None + +def assert_false(a): + assert not a + +def assert_is_none(a): + assert a is None + from pytest import raises, mark diff --git a/tests/test_recordtypes.py b/tests/test_recordtypes.py index 67c5b5a9c2c84ad0ea6095b4c3b2ac81922068a6..bc8150a29c9558b197772c4b03791ba6da481bb9 100644 --- a/tests/test_recordtypes.py +++ b/tests/test_recordtypes.py @@ -26,7 +26,10 @@ import caosdb def test_recordtypes(): - from nose.tools import assert_is_not_none # @UnresolvedImport + + def assert_is_not_none(obj): + assert obj is not None + from sys import hexversion from sys import maxsize as maxint # @Reimport from random import randint @@ -99,7 +102,15 @@ def test_recordtypes(): def test_record_types_as_reference_properties(): - from nose.tools import assert_is_not_none, assert_true, assert_equal # @UnresolvedImport + + def assert_is_not_none(obj): + assert obj is not None + + def assert_true(obj): + assert obj is True + + def assert_equal(obj1, obj2): + assert obj1 == obj2 try: """recordtype without any property.""" diff --git a/tests/test_xmlparsing.py b/tests/test_xmlparsing.py index 50fbbfc07d37aeda1982c7db5c2fc256826a027c..18a10dc95a4c3f6bde318b84a99ceff4b72c8fe4 100644 --- a/tests/test_xmlparsing.py +++ b/tests/test_xmlparsing.py @@ -31,13 +31,15 @@ import pytest @pytest.mark.local_server def test_parse_xml(): from lxml import etree - from nose.tools import assert_equal # @UnresolvedImport - from caosdb.common.models import File - from caosdb.common.models import parse_xml - from caosdb.common.models import Parent - from caosdb.common.models import Property - from caosdb.common.models import Message - from caosdb import INTEGER + from linkahead.common.models import File + from linkahead.common.models import parse_xml + from linkahead.common.models import Parent + from linkahead.common.models import Property + from linkahead.common.models import Message + from linkahead import INTEGER + + def assert_equal(a, b): + assert a == b # define test file xml tmp_name = 'filename'