# HG changeset patch # User Aurelien Campeas # Date 1258637339 -3600 # Node ID 7bb87da97026ff945c660a6b514b716eda3de366 # Parent 3af225f0faa01d802f6b717032ad34d352be395c fix tests diff -r 3af225f0faa0 -r 7bb87da97026 entities/test/unittest_wfobjs.py --- a/entities/test/unittest_wfobjs.py Thu Nov 19 12:58:57 2009 +0100 +++ b/entities/test/unittest_wfobjs.py Thu Nov 19 14:28:59 2009 +0100 @@ -495,12 +495,21 @@ # self.commit() # test that the workflow is correctly enforced + + def _cleanup_msg(self, msg): + """remove the variable part of one specific error message""" + lmsg = msg.split() + lmsg.pop(1) + lmsg.pop() + return ' '.join(lmsg) + def test_transition_checking1(self): cnx = self.login('stduser') user = cnx.user(self.current_session()) ex = self.assertRaises(ValidationError, user.fire_transition, 'activate') - self.assertEquals(ex.errors, {'by_transition': u"transition isn't allowed"}) + self.assertEquals(self._cleanup_msg(ex.errors['by_transition']), + u"transition isn't allowed from") cnx.close() def test_transition_checking2(self): @@ -509,7 +518,8 @@ assert user.state == 'activated' ex = self.assertRaises(ValidationError, user.fire_transition, 'dummy') - self.assertEquals(ex.errors, {'by_transition': u"transition isn't allowed"}) + self.assertEquals(self._cleanup_msg(ex.errors['by_transition']), + u"transition isn't allowed from") cnx.close() def test_transition_checking3(self): @@ -521,7 +531,8 @@ session.set_pool() ex = self.assertRaises(ValidationError, user.fire_transition, 'deactivate') - self.assertEquals(ex.errors, {'by_transition': u"transition isn't allowed"}) + self.assertEquals(self._cleanup_msg(ex.errors['by_transition']), + u"transition isn't allowed from") # get back now user.fire_transition('activate') cnx.commit()