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

Unified Diff: tools/grit/grit/node/misc_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/node/io_unittest.py ('k') | tools/grit/grit/testdata/GoogleDesktop.adm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/node/misc_unittest.py
diff --git a/tools/grit/grit/node/misc_unittest.py b/tools/grit/grit/node/misc_unittest.py
index 7d5ff475b921103d45ed97b228fdce6ed1ccb2c4..01d97140e966b56057a922a1d3d32f78c8eacaac 100644
--- a/tools/grit/grit/node/misc_unittest.py
+++ b/tools/grit/grit/node/misc_unittest.py
@@ -24,14 +24,14 @@ class GritNodeUnittest(unittest.TestCase):
def testUniqueNameAttribute(self):
try:
restree = grd_reader.Parse(
- util.PathFromRoot('grit/test/data/duplicate-name-input.xml'))
+ util.PathFromRoot('grit/testdata/duplicate-name-input.xml'))
self.fail('Expected parsing exception because of duplicate names.')
except grit.exception.Parsing:
pass # Expected case
def testReadFirstIdsFromFile(self):
- test_resource_ids = os.path.join(os.path.dirname(__file__), '..', 'test',
- 'data', 'resource_ids')
+ test_resource_ids = os.path.join(os.path.dirname(__file__), '..',
+ 'testdata', 'resource_ids')
id_dict = misc._ReadFirstIdsFromFile(
test_resource_ids,
{
@@ -175,7 +175,7 @@ class ReleaseNodeUnittest(unittest.TestCase):
<structure type="menu" name="IDC_KLONKMENU" encoding="utf-16" file="klonk.rc" />
</structures>
</release>
- </grit>'''), util.PathFromRoot('grit/test/data'))
+ </grit>'''), util.PathFromRoot('grit/testdata'))
grd.RunGatherers(recursive=True)
hello = grd.GetNodeById('IDS_HELLO')
@@ -207,4 +207,3 @@ class ReleaseNodeUnittest(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
« no previous file with comments | « tools/grit/grit/node/io_unittest.py ('k') | tools/grit/grit/testdata/GoogleDesktop.adm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698