From ce46fd2a06f072ce06cc7e83b5fee2bbd3127e34 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Fri, 26 May 2023 13:56:29 +0200 Subject: [PATCH] TST: simplify tests for caosdb-server#216 --- tests/test_issues_server.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py index 1955979..5fe9864 100644 --- a/tests/test_issues_server.py +++ b/tests/test_issues_server.py @@ -1337,23 +1337,20 @@ def test_195(): with pytest.raises(Exception): admin._set_permissions(CURATOR_ROLE, permission_rules=perms) -@pytest.mark.skip(reason="test breaks server such that all tests fail") def test_216(): """https://gitlab.com/caosdb/caosdb-server/-/issues/216""" - p1 = db.Property(name='p1', datatype=db.DOUBLE, unit='min').insert() - p2 = db.Property(name='p2', datatype=db.TEXT).insert() - A = db.RecordType(name='A').add_property(p1).insert() - B = db.RecordType(name='B').add_parent(name='A').add_property(p2).insert() - + p1 = db.Property(name='p1', datatype=db.DOUBLE).insert() cont = db.Container() - cont.append(db.RecordType(id=A.id, name=A.name) + cont.append(db.RecordType(name="A") .add_property(id=p1.id, name=p1.name, datatype=db.DOUBLE, + unit="min", + importance=db.RECOMMENDED) + .add_property(id=p1.id, name=p1.name, importance=db.RECOMMENDED) - .add_property(id=p1.id, name=p1.name, importance=db.RECOMMENDED)) - cont.append(db.Property(id=p1.id, name=p1.name, datatype=db.DOUBLE, unit='min')) - cont.append(db.RecordType(id=B.id, name=B.name) - .add_parent(id=A.id, name=A.name, inheritance=db.SUGGESTED)) - cont.update() + ) + cont.append(db.RecordType(name="B") + .add_parent(name="A", inheritance=db.SUGGESTED)) + cont.insert() - assert db.execute_query("FIND RECORDTYPE B", unique=True).id == B.id + assert db.execute_query("FIND RECORDTYPE B", unique=True).name == "B" -- GitLab