diff -r 57c60a96de70 -r 45671fb330f5 server/test/unittest_migractions.py --- a/server/test/unittest_migractions.py Tue Sep 29 12:09:04 2015 +0200 +++ b/server/test/unittest_migractions.py Fri Oct 09 17:52:14 2015 +0200 @@ -452,6 +452,9 @@ delete_concerne_rqlexpr = self._rrqlexpr_rset(cnx, 'delete', 'concerne') add_concerne_rqlexpr = self._rrqlexpr_rset(cnx, 'add', 'concerne') + # make sure properties (e.g. etype descriptions) are synced by the + # second call to sync_schema + mh.cmd_sync_schema_props_perms(syncprops=False, commit=False) mh.cmd_sync_schema_props_perms(commit=False) self.assertEqual(cnx.execute('Any D WHERE X name "Personne", X description D')[0][0], @@ -732,8 +735,7 @@ self.assertNotIn('works_for', self.schema) with self.mh() as (cnx, mh): with self.assertRaises(ExecutionError) as exc: - mh.cmd_add_relation_definition('Employee', 'works_for', - 'Company') + mh.cmd_add_relation_definition('Employee', 'works_for', 'Company') self.assertEqual(str(exc.exception), 'Cannot add a relation definition for a computed ' 'relation (works_for)') @@ -792,6 +794,12 @@ 'Cannot synchronize a relation definition for a computed ' 'relation (whatever)') + def test_computed_relation_rename_relation_type(self): + with self.mh() as (cnx, mh): + mh.cmd_rename_relation_type('to_be_renamed', 'renamed') + self.assertIn('renamed', self.schema) + self.assertNotIn('to_be_renamed', self.schema) + # computed attributes migration ############################################ def setup_add_score(self): @@ -799,9 +807,9 @@ assert not cnx.execute('Company X') c = cnx.create_entity('Company') e1 = cnx.create_entity('Employee', reverse_employees=c) - n1 = cnx.create_entity('Note', note=2, concerns=e1) + cnx.create_entity('Note', note=2, concerns=e1) e2 = cnx.create_entity('Employee', reverse_employees=c) - n2 = cnx.create_entity('Note', note=4, concerns=e2) + cnx.create_entity('Note', note=4, concerns=e2) cnx.commit() def assert_score_initialized(self, mh):