Merge branch 'dev' into f-deny-role

tests/test_permissions.py

@@ -188,6 +188,7 @@ def test_basic_acl_stuff():
 
 
 def test_query():
+    db.administration.set_server_property("QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS", "TRUE")
     person = db.RecordType("TestPerson").insert()
     db.Property("TestFirstName", datatype=db.TEXT).insert()
     db.Property("TestConductor", datatype=person).insert()
@@ -231,8 +232,6 @@ def test_query():
     deny_permission(dan, "RETRIEVE:*")
     switch_to_test_user()
 
-    # this fails if server is configured with
-    # QUERY_FILTER_ENTITIES_WITHOUT_RETRIEVE_PERMISSIONS = FALSE
     with raises(db.EmptyUniqueQueryError):
         db.execute_query(
             "FIND ENTITY TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",