[Erp5-report] r34828 jm - /erp5/trunk/products/ERP5/tests/testAlarm.py

[nobody at svn.erp5.org]

Author: jm
Date: Wed Apr 28 13:08:36 2010
New Revision: 34828

URL: http://svn.erp5.org?rev=34828&view=rev
Log:
Update test_18_alarm_activities_execution_order wrt [34777]

Modified:
    erp5/trunk/products/ERP5/tests/testAlarm.py

Modified: erp5/trunk/products/ERP5/tests/testAlarm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAlarm.py?rev=34828&r1=34827&r2=34828&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAlarm.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAlarm.py [utf8] Wed Apr 28 13:08:36 2010
@@ -592,12 +592,13 @@
     transaction.commit()
     messages_list = self.getActivityTool().getMessageList()
     self.assertEquals(2, len(messages_list))
+    expected_tag = alarm.getRelativeUrl() + '_0'
     # check tags after activeSense
     for m in messages_list:
       if m.method_id == 'notify':
-        self.assertEquals(m.activity_kw.get('after_tag'), '0')
+        self.assertEqual(expected_tag, m.activity_kw.get('after_tag'))
       elif m.method_id == sense_method_id:
-        self.assertEquals(m.activity_kw.get('tag'), '0')
+        self.assertEqual(expected_tag, m.activity_kw.get('tag'))
       else:
         raise AssertionError, m.method_id
     # execute alarm sense script and check tags
@@ -606,9 +607,9 @@
     messages_list = self.getActivityTool().getMessageList()
     for m in messages_list:
       if m.method_id == 'notify':
-        self.assertEquals(m.activity_kw.get('after_tag'), '0')
+        self.assertEqual(expected_tag, m.activity_kw.get('after_tag'))
       elif m.method_id == 'immediateReindexObject':
-        self.assertEquals(m.activity_kw.get('tag'), '0')
+        self.assertEqual(expected_tag, m.activity_kw.get('tag'))
       else:
         raise AssertionError, m.method_id