Fix baselineoptimizer issue when deleting a virtual baseline not controlled by scm

Fix baselineoptimizer issue when deleting a virtual baseline not controlled by scm

BUG=397678
TEST=BaselineOptimizerTest.test_virtual_root_redundant_with_ancestors_skip_scm_commands_with_file_not_in_scm
R=dpranke@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=178961

[Xianzhu, 2014-07-25 21:22:24]

Still working on a unit test.

[Dirk Pranke, 2014-07-25 21:24:38]

lgtm

[Dirk Pranke, 2014-07-25 21:25:11]

On 2014/07/25 21:24:38, Dirk Pranke wrote:
> lgtm

bonus points if you were willing to spend a little time seeing if you can add a
test for this, but if not, that's fine, too. I appreciate you looking into it at
all.

[Xianzhu, 2014-07-25 21:32:20]

On 2014/07/25 21:25:11, Dirk Pranke wrote:
> On 2014/07/25 21:24:38, Dirk Pranke wrote:
> > lgtm
> 
> bonus points if you were willing to spend a little time seeing if you can add
a
> test for this, but if not, that's fine, too. I appreciate you looking into it
at
> all.

Test added.

[Xianzhu, 2014-07-25 21:32:25]

The CQ bit was checked by wangxianzhu@chromium.org

[commit-bot: I haz the power, 2014-07-25 21:32:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/423553004/20001

[Dirk Pranke, 2014-07-25 21:33:56]

Nice, thank you!

[Xianzhu, 2014-07-25 21:38:39]

Committed patchset #2 manually as r178961 (presubmit successful).

[eseidel, 2014-07-25 23:04:42]

Is this a fix for the break or did this itself cause the break?

https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20(dbg)/...

[200/1249]
webkitpy.common.checkout.baselineoptimizer_unittest.BaselineOptimizerTest.test_virtual_root_redundant_with_ancestors_skip_scm_commands
erred:
  Traceback (most recent call last):
    File
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py",
line 254, in test_virtual_root_redundant_with_ancestors_skip_scm_commands
     
'/mock-checkout/third_party/WebKit/LayoutTests/platform/win/compositing/mock-baseline-expected.txt',
    File
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py",
line 115, in _assertOptimization
      self.assertTrue(baseline_optimizer.optimize(fs.join(baseline_dirname,
baseline_name)))
    File
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py",
line 342, in optimize
      self._optimize_virtual_root(baseline_name, non_virtual_baseline_name)
    File
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py",
line 318, in _optimize_virtual_root
      self._files_to_add.remove(virtual_root_expected_baseline_path)
  ValueError: list.remove(x): x not in list

I guess we don't run test-webkitpy as part of the blink commit queue??

[Xianzhu, 2014-07-25 23:15:42]

On 2014/07/25 23:04:42, eseidel wrote:
> Is this a fix for the break or did this itself cause the break?
> 
>
https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20(dbg)/...
> 
> [200/1249]
>
webkitpy.common.checkout.baselineoptimizer_unittest.BaselineOptimizerTest.test_virtual_root_redundant_with_ancestors_skip_scm_commands
> erred:
>   Traceback (most recent call last):
>     File
>
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py",
> line 254, in test_virtual_root_redundant_with_ancestors_skip_scm_commands
>      
>
'/mock-checkout/third_party/WebKit/LayoutTests/platform/win/compositing/mock-baseline-expected.txt',
>     File
>
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py",
> line 115, in _assertOptimization
>       self.assertTrue(baseline_optimizer.optimize(fs.join(baseline_dirname,
> baseline_name)))
>     File
>
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py",
> line 342, in optimize
>       self._optimize_virtual_root(baseline_name, non_virtual_baseline_name)
>     File
>
"/mnt/data/b/build/slave/WebKit_Linux__dbg_/build/src/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer.py",
> line 318, in _optimize_virtual_root
>       self._files_to_add.remove(virtual_root_expected_baseline_path)
>   ValueError: list.remove(x): x not in list
> 
> I guess we don't run test-webkitpy as part of the blink commit queue??

My apologies. Fixed. CQ and I did run test-webkitpy for this change.
It's caused by my another change https://codereview.chromium.org/420723008/. I
should have at least run test-webkitpy locally.

[eseidel, 2014-07-25 23:21:01]

Filed crbug.com/397735