Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: tools/grit/grit/gather/rc_unittest.py

Issue 7269003: Change grit to depend on test data in the main repository. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/grit/grit/gather/admin_template_unittest.py ('k') | tools/grit/grit/gather/tr_html_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/gather/rc_unittest.py
diff --git a/tools/grit/grit/gather/rc_unittest.py b/tools/grit/grit/gather/rc_unittest.py
index 1b1102ce33f7e72520d415a4314ec77633b28278..072d9f81ac349ce9f6a8d455ebc97757712ca544 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
@@ -45,10 +45,13 @@ END
out = rc.Section.FromFile(f, 'IDC_KLONKACC')
self.failUnless(out.GetText() == self.part_we_want)
- out = rc.Section.FromFile(util.PathFromRoot(r'grit/test/data/klonk.rc'),
+ out = rc.Section.FromFile(util.PathFromRoot(r'grit/testdata/klonk.rc'),
'IDC_KLONKACC',
encoding='utf-16')
- self.failUnless(out.GetText() == self.part_we_want)
+ out_text = out.GetText().replace('\t', '')
+ out_text = out_text.replace(' ', '')
+ self.part_we_want = self.part_we_want.replace(' ', '')
+ self.failUnless(out_text.strip() == self.part_we_want.strip())
def testDialog(self):
@@ -363,4 +366,3 @@ END''')
if __name__ == '__main__':
unittest.main()
-
« no previous file with comments | « tools/grit/grit/gather/admin_template_unittest.py ('k') | tools/grit/grit/gather/tr_html_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698