# HG changeset patch # User Julien Cristau # Date 1423834335 -3600 # Node ID 2daa5c6dea4dad96718d6c4c32fafad0cd599507 # Parent 582301c2c8caf007c677b9a4414d17e7ae9c6ded [entities] make cw_fti_index_rql_queries predictable Don't depend on the hash function, fixing test with python -R. Related to #4959402. diff -r 582301c2c8ca -r 2daa5c6dea4d entities/__init__.py --- a/entities/__init__.py Fri Feb 13 13:39:33 2015 +0100 +++ b/entities/__init__.py Fri Feb 13 14:32:15 2015 +0100 @@ -53,7 +53,7 @@ """ restrictions = ['X is %s' % cls.__regid__] selected = ['X'] - for attrschema in cls.e_schema.indexable_attributes(): + for attrschema in sorted(cls.e_schema.indexable_attributes()): varname = attrschema.type.upper() restrictions.append('X %s %s' % (attrschema, varname)) selected.append(varname) diff -r 582301c2c8ca -r 2daa5c6dea4d entities/test/unittest_base.py --- a/entities/test/unittest_base.py Fri Feb 13 13:39:33 2015 +0100 +++ b/entities/test/unittest_base.py Fri Feb 13 14:32:15 2015 +0100 @@ -66,8 +66,8 @@ def test_fti_rql_method(self): with self.admin_access.web_request() as req: eclass = self.vreg['etypes'].etype_class('EmailAddress') - self.assertEqual(['Any X, ALIAS, ADDRESS WHERE X is EmailAddress, ' - 'X alias ALIAS, X address ADDRESS'], + self.assertEqual(['Any X, ADDRESS, ALIAS WHERE X is EmailAddress, ' + 'X address ADDRESS, X alias ALIAS'], eclass.cw_fti_index_rql_queries(req))