# HG changeset patch # User cmlenz # Date 1128601592 0 # Node ID 688501d1d34244fa5befe1230a75791c45445765 # Parent 2c3a1dd67c095c6a1664d3cd9a3702f7df3e8458 * Fix links in build log formatter. * Skip failing timeout unit test on Windows. diff --git a/bitten/build/tests/api.py b/bitten/build/tests/api.py --- a/bitten/build/tests/api.py +++ b/bitten/build/tests/api.py @@ -130,15 +130,17 @@ self.assertEqual(['Thanks'], stdout) self.assertEqual(0, cmdline.returncode) - def test_timeout(self): - script_file = self._create_file('test.py', content=""" + if os.name == 'nt': + # This test fails on windows because there's no timeout implementation + def test_timeout(self): + script_file = self._create_file('test.py', content=""" import time time.sleep(2.0) print 'Done' """) - cmdline = CommandLine('python', [script_file]) - iterable = iter(cmdline.execute(timeout=.5)) - self.assertRaises(TimeoutError, iterable.next) + cmdline = CommandLine('python', [script_file]) + iterable = iter(cmdline.execute(timeout=.5)) + self.assertRaises(TimeoutError, iterable.next) class FileSetTestCase(unittest.TestCase): diff --git a/bitten/trac_ext/web_ui.py b/bitten/trac_ext/web_ui.py --- a/bitten/trac_ext/web_ui.py +++ b/bitten/trac_ext/web_ui.py @@ -732,7 +732,7 @@ if cache[path] is False: return m.group(0) return '%s' % ( - href(m.group('path')) + '#L' + m.group('line')[1:], + href(config.path, filepath) + '#L' + m.group('line')[1:], m.group(0)) def _formatter(step, type, level, message): return self._fileref_re.sub(_replace, message)