changeset 440:e660687ac89c

Follow-up fix to [486]: trailing chars in auto-linked log messages was getting removed.
author cmlenz
date Tue, 21 Aug 2007 11:23:56 +0000
parents 20ddfbb8e879
children 641a73f078f5
files bitten/tests/web_ui.py bitten/web_ui.py
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/tests/web_ui.py
+++ b/bitten/tests/web_ui.py
@@ -164,10 +164,10 @@
         comp = SourceFileLinkFormatter(self.env)
         formatter = comp.get_formatter(req, build)
 
-        output = formatter(step, None, None, u'error in foo/bar.c')
+        output = formatter(step, None, None, u'error in foo/bar.c: bad')
         self.assertEqual(Markup, type(output))
         self.assertEqual('error in <a href="/trac/browser/trunk/foo/bar.c">'
-                         'foo/bar.c</a>', output)
+                         'foo/bar.c</a>: bad', output)
 
     def test_format_simple_link_not_in_repos(self):
         BuildConfig(self.env, name='test', path='trunk').insert()
@@ -186,9 +186,9 @@
         comp = SourceFileLinkFormatter(self.env)
         formatter = comp.get_formatter(req, build)
 
-        output = formatter(step, None, None, u'error in foo/bar.c')
+        output = formatter(step, None, None, u'error in foo/bar.c: bad')
         self.assertEqual(Markup, type(output))
-        self.assertEqual('error in foo/bar.c', output)
+        self.assertEqual('error in foo/bar.c: bad', output)
 
     def test_format_link_in_repos_with_line(self):
         BuildConfig(self.env, name='test', path='trunk').insert()
@@ -205,10 +205,10 @@
         comp = SourceFileLinkFormatter(self.env)
         formatter = comp.get_formatter(req, build)
 
-        output = formatter(step, None, None, u'error in foo/bar.c:123')
+        output = formatter(step, None, None, u'error in foo/bar.c:123: bad')
         self.assertEqual(Markup, type(output))
         self.assertEqual('error in <a href="/trac/browser/trunk/foo/bar.c#L123">'
-                         'foo/bar.c:123</a>', output)
+                         'foo/bar.c:123</a>: bad', output)
 
     def test_format_link_not_in_repos_with_line(self):
         BuildConfig(self.env, name='test', path='trunk').insert()
@@ -227,9 +227,9 @@
         comp = SourceFileLinkFormatter(self.env)
         formatter = comp.get_formatter(req, build)
 
-        output = formatter(step, None, None, u'error in foo/bar.c:123')
+        output = formatter(step, None, None, u'error in foo/bar.c:123: bad')
         self.assertEqual(Markup, type(output))
-        self.assertEqual('error in foo/bar.c:123', output)
+        self.assertEqual('error in foo/bar.c:123: bad', output)
 
 
 def suite():
--- a/bitten/web_ui.py
+++ b/bitten/web_ui.py
@@ -604,7 +604,7 @@
                     buf.append(message[offset:start])
                 buf.append(_replace(mo))
                 offset = end
-            if offset < len(buf):
+            if offset < len(message):
                 buf.append(message[offset:])
             return Markup("").join(buf)
 
Copyright (C) 2012-2017 Edgewall Software