From 15b7ecf7fba45a8f02f5564f6e80e5d7d2007469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 21 Apr 2022 09:01:55 +0200
Subject: [PATCH] TST: allow tests to be called from src dir; import pytest
---
unittests/test_apiutils.py | 1 +
unittests/test_entity.py | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py
index 2859a0ec..1df392a3 100644
--- a/unittests/test_apiutils.py
+++ b/unittests/test_apiutils.py
@@ -26,6 +26,7 @@
# A. Schlemmer, 02/2018
+import pytest
import caosdb as db
import caosdb.apiutils
from caosdb.apiutils import (apply_to_ids, compare_entities, create_id_query,
diff --git a/unittests/test_entity.py b/unittests/test_entity.py
index 1e88702a..f2891fda 100644
--- a/unittests/test_entity.py
+++ b/unittests/test_entity.py
@@ -26,10 +26,13 @@
import unittest
from lxml import etree
+import os
from caosdb import (INTEGER, Entity, Property, Record, RecordType,
configure_connection)
from caosdb.connection.mockup import MockUpServerConnection
+UNITTESTDIR = os.path.dirname(os.path.abspath(__file__))
+
class TestEntity(unittest.TestCase):
@@ -87,7 +90,7 @@ class TestEntity(unittest.TestCase):
"""
parser = etree.XMLParser(remove_comments=True)
entity = Entity._from_xml(Entity(),
- etree.parse("unittests/test_record.xml",
+ etree.parse(os.path.join(UNITTESTDIR, "test_record.xml"),
parser).getroot())
self.assertEqual(entity.role, "Record")
--
GitLab