--- a/entities/test/unittest_wfobjs.py Sun Nov 08 21:53:18 2009 +0100
+++ b/entities/test/unittest_wfobjs.py Fri Nov 20 19:35:54 2009 +0100
@@ -482,12 +482,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.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):
@@ -495,7 +504,8 @@
user = cnx.user(self.session)
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):
@@ -507,7 +517,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()