TST: Update test_permissions.py to new query errors

tests/test_permissions.py

@@ -195,7 +195,6 @@ def test_basic_acl_stuff():
     assert_false("DELETE" in other_role_permissions)
 
 
-@with_setup(setup, teardown)
 def test_query():
     person = db.RecordType("TestPerson").insert()
     db.Property("TestFirstName", datatype=db.TEXT).insert()
@@ -210,30 +209,21 @@ def test_query():
         name="TestConductor",
         value=dan.id).insert()
 
-    assert_equal(
-        db.execute_query(
+    assert db.execute_query(
         "FIND TestExperiment WHICH HAS A TestConductor->TestPerson",
-            unique=True).id,
-        exp.id)
-    assert_equal(
-        db.execute_query(
+        unique=True).id == exp.id
+    assert db.execute_query(
         "FIND TestExperiment WHICH HAS A TestConductor=TestPerson",
-            unique=True).id,
-        exp.id)
-    assert_equal(
-        db.execute_query(
+        unique=True).id == exp.id
+    assert db.execute_query(
         "FIND TestExperiment WHICH HAS A TestConductor=" + str(dan.id),
-            unique=True).id, exp.id)
-    assert_equal(
-        db.execute_query(
+        unique=True).id == exp.id
+    assert db.execute_query(
         "FIND TestExperiment",
-            unique=True).id,
-        exp.id)
-    assert_equal(
-        db.execute_query(
+        unique=True).id == exp.id
+    assert db.execute_query(
         "FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
-            unique=True).id,
-        exp.id)
+        unique = True).id == exp.id
 
     '''success'''
     grant_permission(person, "RETRIEVE:*")
@@ -241,11 +231,9 @@ def test_query():
     grant_permission(exp, "RETRIEVE:*")
 
     switch_to_test_user()
-    assert_equal(
-        db.execute_query(
+    assert db.execute_query(
         "FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
-            unique=True).id,
-        exp.id)
+        unique = True).id == exp.id
 
     '''failure - dan'''
     deny_permission(dan, "RETRIEVE:*")
@@ -253,11 +241,10 @@ def test_query():
 
     # this fails if server is configured with
     # QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS = FALSE
-    with raises(db.TransactionError) as cm:
+    with raises(db.EmptyUniqueQueryError):
         db.execute_query(
             "FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
             unique = True)
-    assert cm.value.has_error(db.EntityDoesNotExistError)
     '''... but works without the which clause'''
     assert db.execute_query("FIND TestExperiment", unique = True).id == exp.id
     '''and with the id'''
@@ -270,15 +257,13 @@ def test_query():
     deny_permission(exp, "RETRIEVE:*")
     switch_to_test_user()
 
-    with raises(db.TransactionError) as cm:
+    with raises(db.EmptyUniqueQueryError):
         db.execute_query(
             "FIND TestExperiment WHICH HAS A TestConductor=TestDaniel",
             unique = True)
-    assert cm.value.has_error(db.EntityDoesNotExistError)
 
-    with raises(db.TransactionError) as cm:
+    with raises(db.EmptyUniqueQueryError):
         db.execute_query("FIND TestExperiment", unique = True)
-    assert cm.value.has_error(db.EntityDoesNotExistError)
 
 
 @ with_setup(setup, teardown)
@@ -1210,7 +1195,7 @@ def test_check_entity_acl_roles():
     with raises(db.TransactionError) as cm:
         grant_permission(p, "USE:AS_PARENT", username="asdf-non-existing",
                          switch=False)
-    errors = cm.value.entities[0].errors
+    errors = cm.value.entities[0].get_errors()
     assert errors[0].description == "User Role does not exist."
     db.administration.set_server_property(
         "CHECK_ENTITY_ACL_ROLES_MODE", "SHOULD")