diff -r 1c8d6eec4c25 -r 7e16e056eecb test/unittest_rqlrewrite.py
--- a/test/unittest_rqlrewrite.py	Tue Sep 13 18:24:35 2011 +0200
+++ b/test/unittest_rqlrewrite.py	Wed Sep 14 09:10:58 2011 +0200
@@ -209,9 +209,9 @@
                         ('A', 'X'): (c2,),
                         }, {})
         # XXX suboptimal
-        self.failUnlessEqual(rqlst.as_string(),
-                             "Any C,A,R WITH A,R,C BEING "
-                             "(Any A,R,C WHERE A ref R, A? inlined_card C, "
+        self.assertEqual(rqlst.as_string(),
+                             "Any C,A,R WITH A,C,R BEING "
+                             "(Any A,C,R WHERE A? inlined_card C, A ref R, "
                              "(A is NULL) OR (EXISTS(A inlined_card B, B require_permission D, "
                              "B is Card, D is CWPermission)), "
                              "A is Affaire, C is Card, EXISTS(C require_permission E, E is CWPermission))")