Fix assert in grit script by always resolving template vars.

Fix assert in grit script by always resolving template vars.

OutputNode.GetFilename() does not resolve environment vars, meaning that
when vars are used, the filename used in python does not match the files
created by the script. Use GetOutputFilename() everywhere, which properly
resolves variables in file names.

BUG=
Test: Build grit target with template vars in the output file name.

Review-Url: https://codereview.chromium.org/2802853003
Cr-Commit-Position: refs/heads/master@{#464616}
Committed: https://chromium.googlesource.com/chromium/src/+/6fcd1789ae575456137efd8e707003492d443751

[slan, 2017-04-05 23:53:59]

slan@chromium.org changed reviewers:
+ thakis@chromium.org

[slan, 2017-04-05 23:54:00]

Hey Nico,

We found what appears to be a bug in the AssertOutput step of the grit script,
where env variables in the output files are not resolved when comparing the
output to the expectation.

This prevents us from using a template with a grit object that writes
differently-named output files. 

PTAL!

[Nico, 2017-04-06 14:10:00]

Is it possible to write a test for this?

[slan, 2017-04-06 21:32:00]

Done. Full disclosure, this patch was written by yilongyao@.

Thanks Yilong!

[yilongyao1, 2017-04-11 17:33:07]

The CQ bit was checked by yilongyao@google.com

[yilongyao1, 2017-04-11 17:33:07]

The CQ bit was unchecked by yilongyao@google.com

[yilongyao1, 2017-04-11 17:33:07]

The CQ bit was checked by yilongyao@google.com

[yilongyao1, 2017-04-11 17:33:08]

The CQ bit was unchecked by yilongyao@google.com

[yilongyao1, 2017-04-11 17:33:18]

The CQ bit was checked by yilongyao@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-04-11 17:34:12]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[yilongyao1, 2017-04-11 17:34:21]

On 2017/04/06 21:32:00, slan wrote:
> Done. Full disclosure, this patch was written by yilongyao@.
> 
> Thanks Yilong!

Tests are now in the CL. Please take another look. Thanks!

[commit-bot: I haz the power, 2017-04-11 17:47:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-04-11 17:47:58]

Dry run: This issue passed the CQ dry run.

[yilongyao1, 2017-04-11 18:01:13]

The CQ bit was checked by yilongyao@google.com

[commit-bot: I haz the power, 2017-04-11 18:01:42]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-11 18:01:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-04-11 18:01:43]

No L-G-T-M from a valid reviewer yet.
CQ run can only be started once the patch has received an L-G-T-M from a full
committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,_not_ a
full super star committer.
Committers are members of the group "project-chromium-committers".
Note that this has nothing to do with OWNERS files.

[Nico, 2017-04-13 15:58:49]

lgtm

[slan, 2017-04-13 23:50:07]

The CQ bit was checked by slan@chromium.org

[commit-bot: I haz the power, 2017-04-13 23:50:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-14 00:04:29]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1492127407523910,
"parent_rev": "d81f062ff81c4c429c0d20decbb654c7151a3169", "commit_rev":
"6fcd1789ae575456137efd8e707003492d443751"}

[commit-bot: I haz the power, 2017-04-14 00:06:32]

Description was changed from

==========
Fix assert in grit script by always resolving template vars.

OutputNode.GetFilename() does not resolve environment vars, meaning that
when vars are used, the filename used in python does not match the files
created by the script. Use GetOutputFilename() everywhere, which properly
resolves variables in file names.

BUG=
Test: Build grit target with template vars in the output file name.
==========

to

==========
Fix assert in grit script by always resolving template vars.

OutputNode.GetFilename() does not resolve environment vars, meaning that
when vars are used, the filename used in python does not match the files
created by the script. Use GetOutputFilename() everywhere, which properly
resolves variables in file names.

BUG=
Test: Build grit target with template vars in the output file name.

Review-Url: https://codereview.chromium.org/2802853003
Cr-Commit-Position: refs/heads/master@{#464616}
Committed:
https://chromium.googlesource.com/chromium/src/+/6fcd1789ae575456137efd8e7070...
==========

[commit-bot: I haz the power, 2017-04-14 00:06:33]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/6fcd1789ae575456137efd8e7070...