From 82e8c51cbb031305e8ef85859128ee1b72a4c833 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Fri, 5 Apr 2024 20:30:18 +0200
Subject: [PATCH] Remove usage of nose.tools
---
tests/test_messages.py | 2 +-
tests/test_permissions.py | 20 ++++++++++++++------
tests/test_recordtypes.py | 15 +++++++++++++--
tests/test_xmlparsing.py | 16 +++++++++-------
4 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/tests/test_messages.py b/tests/test_messages.py
index 7943042..ae0d157 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 fafc70d..da4a549 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 67c5b5a..bc8150a 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 50fbbfc..18a10dc 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'
--
GitLab