WIP: Update 147, remove 161

tests/test_tickets.py

@@ -927,14 +927,11 @@ def test_ticket_147():
         assert_equal(r21.id, s[0].id)
 
         # typo: SMALLES
-        try:
+        with pytest.raises(TransactionError):
             s = db.execute_query(
                 "FIND ticket147_Fre* WHICH HAS THE SMALLEST ticket147_ObstacleRadius AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS THE SMALLES ticket147_TimeStep)"
             )
-            raise AssertionError("This should raise a TransactionError")
-        except TransactionError:
-            pass
-
+        
     finally:
         try:
             c2.delete()
@@ -1150,28 +1147,6 @@ def test_ticket_166():
             pass
 
 
-def test_ticket_161():
-
-    try:
-        rt = db.RecordType(name="RecordTypeTest")
-        rt.insert()
-
-        assert_true(rt.is_valid())
-
-        rt2 = db.RecordType(name="RecordTypeTest")
-        assert_raises(UniqueNamesError, rt2.insert)
-
-    finally:
-        try:
-            rt2.delete()
-        except BaseException:
-            pass
-        try:
-            rt.delete()
-        except BaseException:
-            pass
-
-
 def test_ticket_178():
     from lxml import etree