Provide defines as local variables in if-expressions.

grit/grd_reader_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Unit tests for grd_reader package'''
 
 import os
 import sys
 if __name__ == '__main__':
@@ skipping 271 matching lines @@
         (exception.MissingElement, u'<output filename="x" type="y" />'),
     ]
     for raises, data in gritpart_failures:
       top_grd = StringIO.StringIO(template % u'<part file="bad.grp" />')
       with util.TempDir({'bad.grp': data}) as temp_dir:
         self.assertRaises(raises, grd_reader.Parse, top_grd, temp_dir.GetPath())
 
   def testEarlyEnoughPlatformSpecification(self):
     # This is a regression test for issue
     # https://code.google.com/p/grit-i18n/issues/detail?id=23
-    #
-    # This test only works on platforms for which one of the is_xyz
-    # shortcuts in .grd expressions is true. If this string remains
-    # empty, abort the test.
-    platform = base.Node.GetPlatformAssertion(sys.platform)
-    if not platform:
-      return
-
     grd_text = u'''<?xml version="1.0" encoding="UTF-8"?>
       <grit latest_public_release="1" current_release="1">
         <release seq="1">
           <messages>
             <if expr="not pp_ifdef('use_titlecase')">
               <message name="IDS_XYZ">foo</message>
             </if>
             <!-- The assumption is that use_titlecase is never true for
                  this platform. When the platform isn't set to 'android'
                  early enough, we get a duplicate message name. -->
-            <if expr="%s">
+            <if expr="os == '%s'">
               <message name="IDS_XYZ">boo</message>
             </if>
           </messages>
         </release>
-      </grit>''' % platform
+      </grit>''' % sys.platform

[Jói, 2014/02/07 10:53:12]

This test is intended to be a regression test for bug 23, which occurred when
the target platform wasn't set early enough. Are you sure this still tests that?

[newt (away), 2014/02/07 17:24:45]

Yes, the test currently passes, but if I revert the change to grit/grd_reader.py
from https://codereview.chromium.org/118663003, the test fails.

This is because the value of "os" on line 302 is the target platform, so "os" ==
"linux" iff "is_linux" is True, which is what the test previously evaluated.

     with util.TempDir({}) as temp_dir:
       grd_reader.Parse(StringIO.StringIO(grd_text), temp_dir.GetPath(),
                        target_platform='android')
 
 
 if __name__ == '__main__':
   unittest.main()