WIP: pipeline

tests/test_affiliation.py

@@ -27,7 +27,7 @@
 """
 import os
 import caosdb as db
-from nose.tools import nottest, assert_true, assert_equal, with_setup, assert_is_not_none
+from nose.tools import nottest, assert_equal, assert_is_not_none
 from pytest import raises
 
 
@@ -65,25 +65,22 @@ def teardown_function(function):
 def test_affiliation_there():
     par = db.RecordType(name="TestRT1")
     ch = db.Record(name="TestRec").add_parent(par)
-    assert_is_not_none(ch.get_parent("TestRT1"))
-    assert_true(hasattr(ch.get_parent("TestRT1"), "affiliation"))
+    assert ch.get_parent("TestRT1") is not None
+    assert hasattr(ch.get_parent("TestRT1"), "affiliation")
 
 
-@with_setup(setup, teardown)
 def test_rec_rec_is_parthood():
     par = db.Record(name="TestRecordChild").add_parent(
         name=rec_name).insert().get_parent(rec_name)
     assert_equal(par.affiliation, "PARTHOOD")
 
 
-@with_setup(setup, teardown)
 def test_rec_rt_is_instantiation():
     par = db.Record(name="TestRecordChild").add_parent(
         name=recty_name).insert().get_parent(recty_name)
     assert_equal(par.affiliation, "INSTANTIATION")
 
 
-@with_setup(setup, teardown)
 def test_rec_prop_is_invalid():
     with raises(db.TransactionError) as cm:
         db.Record(name="TestRecordChild").add_parent(name=prop_name).insert()
@@ -94,7 +91,6 @@ def test_rec_prop_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_rec_file_is_invalid():
     with raises(db.TransactionError) as cm:
         db.Record(name="TestRecordChild").add_parent(name=file_name).insert()
@@ -103,7 +99,6 @@ def test_rec_file_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_rt_rec_is_invalid():
     with raises(db.TransactionError) as cm:
         db.RecordType(
@@ -114,14 +109,12 @@ def test_rt_rec_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_rt_rt_is_subtyping():
     par = db.RecordType(name="TestRecordTypeChild").add_parent(
         name=recty_name).insert().get_parent(recty_name)
     assert_equal(par.affiliation, "SUBTYPING")
 
 
-@with_setup(setup, teardown)
 def test_rt_prop_is_invalid():
     with raises(db.TransactionError) as cm:
         db.RecordType(
@@ -132,7 +125,6 @@ def test_rt_prop_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_rt_file_is_invalid():
     with raises(db.TransactionError) as cm:
         db.RecordType(
@@ -143,7 +135,6 @@ def test_rt_file_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_prop_rec_is_invalid():
     with raises(db.TransactionError) as cm:
         db.Property(
@@ -155,7 +146,6 @@ def test_prop_rec_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_prop_rt_is_invalid():
     with raises(db.TransactionError) as cm:
         db.Property(
@@ -167,7 +157,6 @@ def test_prop_rt_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_prop_prop_is_subtyping():
     par = db.Property(
         name="TestPropertyChild",
@@ -176,7 +165,6 @@ def test_prop_prop_is_subtyping():
     assert_equal(par.affiliation, "SUBTYPING")
 
 
-@with_setup(setup, teardown)
 def test_prop_file_is_invalid():
     with raises(db.TransactionError) as cm:
         db.Property(
@@ -188,7 +176,6 @@ def test_prop_file_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_file_rec_is_parthood():
     par = db.File(
         name="TestFileChild",
@@ -198,7 +185,6 @@ def test_file_rec_is_parthood():
     assert_equal(par.affiliation, "PARTHOOD")
 
 
-@with_setup(setup, teardown)
 def test_file_rt_is_instantiation():
     par = db.File(
         name="TestFileChild",
@@ -208,7 +194,6 @@ def test_file_rt_is_instantiation():
     assert_equal(par.affiliation, "INSTANTIATION")
 
 
-@with_setup(setup, teardown)
 def test_file_prop_is_invalid():
     with raises(db.TransactionError) as cm:
         db.File(
@@ -221,7 +206,6 @@ def test_file_prop_is_invalid():
     assert ee.msg == "Affiliation is not defined for this child-parent constellation."
 
 
-@with_setup(setup, teardown)
 def test_file_file_is_invalid():
     with raises(db.TransactionError) as cm:
         db.File(

tests/test_creation.py

@@ -27,7 +27,6 @@
 # A. Schlemmer, 08/2014
 
 from caosdb import Container, RecordType, Property, execute_query
-from nose.tools import with_setup  # @UnresolvedImport
 
 
 def setup_function(function):
@@ -37,7 +36,6 @@ def setup_function(function):
         pass
 
 
-@with_setup(setup, setup)
 def test_PA_Datamodel():
     pr10 = Property(name="PA_DataFile", id=-10, datatype="file",
                     description="The property specifying the "

tests/test_datatype_inheritance.py

@@ -25,8 +25,7 @@ from caosdb import Container, Property, RecordType, Record, execute_query
 import caosdb
 import caosdb as db
 from caosdb.connection.connection import get_connection
-# @UnresolvedImport
-from nose.tools import assert_is_not_none, assert_true, assert_equal, with_setup
+from nose.tools import assert_is_not_none, assert_true, assert_equal
 
 from caosdb.exceptions import TransactionError
 from pytest import raises
@@ -47,7 +46,6 @@ def teardown_function(function):
         pass
 
 
-@with_setup(setup, teardown)
 def test_default_datatype_for_recordtypes():
     rt1 = db.RecordType(name="TestRT1").insert()
     rt2 = db.RecordType(name="TestRT2").add_property(name="TestRT1").insert()
@@ -62,7 +60,6 @@ def test_default_datatype_for_recordtypes():
     assert_equal(p.datatype, rt1.name)
 
 
-@with_setup(setup, teardown)
 def test_datatype_inheritance():
 
     insert = '<Insert><Property id="-1" name="test_property" description="bla" datatype="Text"/><RecordType name="test_rt" description="bla">    <Property id="-1" importance="obligatory" /></RecordType></Insert>'

tests/test_deletion.py

@@ -26,7 +26,7 @@
 # Testcase fuer deletion
 # A. Schlemmer, 08/2014
 
-from nose.tools import with_setup, assert_false, assert_true, assert_raises, assert_equal, assert_is_not_none  # @UnresolvedImport
+from nose.tools import with_setup, assert_false, assert_true, assert_raises, assert_equal
 
 import caosdb as h
 
@@ -37,18 +37,11 @@ def setup_module():
         old.delete()
 
 
-def setup161():
+def test_delete_referencing_properties():
     h.RecordType(name="RT1").insert()
     h.RecordType(name="RT2").add_property("RT1").insert()
     h.RecordType(name="RT3").insert()
 
-
-def teardown161():
-    setup_module()
-
-
-@with_setup(setup161, teardown161)
-def test_delete_referencing_properties():
     rt3 = h.RecordType(name="RT3").retrieve()
     rt2 = h.RecordType(name="RT2").retrieve()
     rt3.add_property(
@@ -68,7 +61,6 @@ def setup_function(function):
         print(e)
 
 
-@with_setup(setup, setup)
 def test_deletion():
     c = h.Container()
     c.append(
@@ -148,7 +140,7 @@ def test_deletion():
 
     cr2.insert()
     assert_true(cr2.is_valid())
-    assert_is_not_none(cr2.id)
+    assert cr2.id is not None
 
     c.extend([cr1, sr, d])
     assert_raises(h.TransactionError, c.delete)