diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:14:58 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:14:58 +0000 |
| commit | 6161513ee49d082ff64b906bdb91e827592547fa (patch) | |
| tree | 64f6ebc754cf8d2ba7003b8c82e990b4a356f6ef /tools | |
| parent | 588623406d91093ddafa68eadd2256b5cfa634e0 (diff) | |
| download | chromium_src-6161513ee49d082ff64b906bdb91e827592547fa.zip chromium_src-6161513ee49d082ff64b906bdb91e827592547fa.tar.gz chromium_src-6161513ee49d082ff64b906bdb91e827592547fa.tar.bz2 | |
Fix grit unittests.
The two rc unittests are failing because it appears the data
files checked into svn don't match. It's easier to change the
tests because the data is in a different (internal only) repo.
AFAICT, this has been broken forever.
The other fix is because a test became more correct after
r43930, but the test was passing anyway.
Review URL: http://codereview.chromium.org/2131013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/grit/grit/format/rc_unittest.py | 2 | ||||
| -rw-r--r-- | tools/grit/grit/gather/rc_unittest.py | 2 | ||||
| -rw-r--r-- | tools/grit/grit/tclib_unittest.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/grit/grit/format/rc_unittest.py b/tools/grit/grit/format/rc_unittest.py index c7b0ee8..bf4bc26 100644 --- a/tools/grit/grit/format/rc_unittest.py +++ b/tools/grit/grit/format/rc_unittest.py @@ -78,7 +78,7 @@ END'''.strip()) build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf) output = buf.getvalue() self.failUnless(output.strip() == u''' -IDC_KLONKMENU MENU +IDC_KLONKMENU MENU BEGIN POPUP "&File" BEGIN diff --git a/tools/grit/grit/gather/rc_unittest.py b/tools/grit/grit/gather/rc_unittest.py index 636b421..1b1102c 100644 --- a/tools/grit/grit/gather/rc_unittest.py +++ b/tools/grit/grit/gather/rc_unittest.py @@ -20,7 +20,7 @@ from grit import util class RcUnittest(unittest.TestCase): - part_we_want = '''IDC_KLONKACC ACCELERATORS + part_we_want = '''IDC_KLONKACC ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT diff --git a/tools/grit/grit/tclib_unittest.py b/tools/grit/grit/tclib_unittest.py index 0d20f1a..92c12f7 100644 --- a/tools/grit/grit/tclib_unittest.py +++ b/tools/grit/grit/tclib_unittest.py @@ -16,6 +16,7 @@ import unittest from grit import tclib +from grit import exception import grit.extern.tclib @@ -157,6 +158,7 @@ class TclibUnittest(unittest.TestCase): def testPlaceholderNameChecking(self): try: ph = tclib.Placeholder('BINGO BONGO', 'bla', 'bla') + raise Exception("We shouldn't get here") except exception.InvalidPlaceholderName: pass # Expect exception to be thrown because presentation contained space |