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

Unified Diff: tools/grit/grit/grd_reader_unittest.py

Issue 7976026: Prepare for moving grit to its own open-source project. This mostly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 9 years, 3 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
Index: tools/grit/grit/grd_reader_unittest.py
diff --git a/tools/grit/grit/grd_reader_unittest.py b/tools/grit/grit/grd_reader_unittest.py
index 1670e4a14451fc4cc44668402dcafa43967d0219..050f877c4bc876948e4efce6bfb329f0f9749047 100644
--- a/tools/grit/grit/grd_reader_unittest.py
+++ b/tools/grit/grit/grd_reader_unittest.py
@@ -114,8 +114,10 @@ class GrdReaderUnittest(unittest.TestCase):
grit_root_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
'..')
root.AssignFirstIds(
- os.path.join(grit_root_dir, "../../chrome/app/generated_resources.grd"),
- None, {})
+ os.path.join(grit_root_dir,
+ "grit/testdata/chrome/app/generated_resources.grd"),
+ os.path.join(grit_root_dir, "grit/testdata/tools/grit/resource_ids"),
+ {})
messages_node = root.children[0].children[0]
self.failUnless(isinstance(messages_node, empty.MessagesNode))
self.failUnless(messages_node.attrs["first_id"] !=
@@ -144,7 +146,9 @@ class GrdReaderUnittest(unittest.TestCase):
grit_root_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
'..')
root.AssignFirstIds(
- os.path.join(grit_root_dir, "../../test.grd"),
+ # This file does not actually exist, but the path must match
+ # the path of the resource_ids file as it has SRCDIR set to "."
+ os.path.join(grit_root_dir, "grit/testdata/test.grd"),
os.path.join(grit_root_dir, "grit/testdata/resource_ids"),
{})
messages_node = root.children[0].children[0]
« no previous file with comments | « tools/grit/grit.py ('k') | tools/grit/grit/grit_runner.py » ('j') | tools/grit/grit/node/misc.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698