Changeset 16030

Timestamp:

6 Mar 2020, 21:20:29 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust log messages and tests.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1713 +1713 @@
                 mapping = {'a':', '.join(deleted)}))
             self.context.writeLogMessage(
-                self,'removed: %s at %s' %
-                (', '.join(deleted), self.context.level))
+                self,'removed: %s' % (', '.join(deleted)))
         self.redirect(self.url(self.context, u'@@manage')+'#tab2')
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -825 +825 @@
         self.assertTrue(
             'zope.mgr - students.browser.StudyLevelManageFormPage '
-            '- K1000000 - removed: COURSE1 at 100' in logcontent)
+            '- K1000000 - level 100 - removed: COURSE1' in logcontent)
         self.browser.getLink("here").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -2805 +2805 @@
         logcontent = open(logfile).read()
         self.assertTrue('K1000000 - students.browser.StudyLevelEditFormPage '
-        '- K1000000 - removed: COURSE1 at 200' in logcontent)
+        '- K1000000 - level 200 - removed: COURSE1' in logcontent)
         # They can add the same ticket using the edit page directly.
         # We can do the same by adding the course on the manage page directly
@@ -2815 +2815 @@
         logcontent = open(logfile).read()
         self.assertTrue('K1000000 - students.browser.StudyLevelEditFormPage - '
-            'K1000000 - added: COURSE1|200|2004' in logcontent)
+            'K1000000 - level 200 - added: COURSE1|200|2004' in logcontent)
         # Course list can be registered
         self.browser.getControl("Register course list").click()
@@ -2872 +2872 @@
         self.assertTrue(
             'K1000000 - students.browser.StudyLevelEditFormPage - '
-            'K1000000 - course tickets invalidated: COURSE1'
+            'K1000000 - level 100 - course tickets invalidated: COURSE1'
             in logcontent)
         return