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

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

Issue 7285006: Revert 91161 - 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/clique_unittest.py ('k') | tools/grit/grit/gather/admin_template_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/format/rc_unittest.py
===================================================================
--- tools/grit/grit/format/rc_unittest.py (revision 91164)
+++ tools/grit/grit/format/rc_unittest.py (working copy)
@@ -68,9 +68,9 @@
def testRcSection(self):
root = grd_reader.Parse(StringIO.StringIO('''
<structures>
- <structure type="menu" name="IDC_KLONKMENU" file="grit\\testdata\klonk.rc" encoding="utf-16" />
- <structure type="dialog" name="IDD_ABOUTBOX" file="grit\\testdata\klonk.rc" encoding="utf-16" />
- <structure type="version" name="VS_VERSION_INFO" file="grit\\testdata\klonk.rc" encoding="utf-16" />
+ <structure type="menu" name="IDC_KLONKMENU" file="grit\\test\data\klonk.rc" encoding="utf-16" />
+ <structure type="dialog" name="IDD_ABOUTBOX" file="grit\\test\data\klonk.rc" encoding="utf-16" />
+ <structure type="version" name="VS_VERSION_INFO" file="grit\\test\data\klonk.rc" encoding="utf-16" />
</structures>'''), flexible_root = True)
util.FixRootForUnittest(root)
root.RunGatherers(recursive = True)
@@ -184,7 +184,7 @@
self.failUnless(output.strip() == expected)
def testRcIncludeFlattenedHtmlFile(self):
- input_file = util.PathFromRoot('grit/testdata/include_test.html')
+ input_file = util.PathFromRoot('grit/test/data/include_test.html')
output_file = '%s/HTML_FILE1_include_test.html' % tempfile.gettempdir()
root = grd_reader.Parse(StringIO.StringIO('''
<includes>
@@ -223,7 +223,7 @@
def testStructureNodeOutputfile(self):
- input_file = util.PathFromRoot('grit/testdata/simple.html')
+ input_file = util.PathFromRoot('grit/test/data/simple.html')
root = grd_reader.Parse(StringIO.StringIO(
'<structure type="tr_html" name="IDR_HTML" file="%s" />' %input_file),
flexible_root = True)
@@ -251,7 +251,7 @@
<grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
<release seq="1" allow_pseudo="False">
<structures fallback_to_english="True">
- <structure type="dialog" name="IDD_ABOUTBOX" file="grit\\testdata\klonk.rc" encoding="utf-16" />
+ <structure type="dialog" name="IDD_ABOUTBOX" file="grit\\test\data\klonk.rc" encoding="utf-16" />
</structures>
</release>
</grit>'''), util.PathFromRoot('.'))
« no previous file with comments | « tools/grit/grit/clique_unittest.py ('k') | tools/grit/grit/gather/admin_template_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698