webkitpy: Merge script fix windows directory removing.

webkitpy: Merge script fix windows directory removing.

Attempt to remove a directory tree multiple times as on Windows a
process which is currently closing could still have a file open in the
directory.

Also continue going even if we fail to remove the directory.

The merge script currently sometimes fails on Windows with the following
error;
-------------------------
Traceback (most recent call last):
  File "E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results", line 185, in <module>
    main(sys.argv[1:])
  File "E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results", line 161, in main
    shutil.rmtree(args.output_directory)
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 256, in rmtree
    onerror(os.rmdir, path, sys.exc_info())
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 254, in rmtree
    os.rmdir(path)
WindowsError: [Error 32] The process cannot access the file because it is being used by another process: 'E:\\b\\rr\\tmpxu2pfv\\w'
WARNING:root:merge_cmd had non-zero return code: 1
-------------------------

BUG=717347, 524758
Review-Url: https://codereview.chromium.org/2862173002
Cr-Commit-Position: refs/heads/master@{#469588}
Committed: https://chromium.googlesource.com/chromium/src/+/49345d02f5e5a10cf2789d1d45b4eeec4656b542

[mithro, 2017-05-05 00:58:00]

tansell@chromium.org changed reviewers:
+ dpranke@google.com, mcgreevy@chromium.org

[mithro, 2017-05-05 00:58:23]

The CQ bit was checked by tansell@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-05 00:58:56]

Dry run: CQ is trying da patch.

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

[Dirk Pranke, 2017-05-05 01:05:01]

dpranke@chromium.org changed reviewers:
+ dpranke@chromium.org

[Dirk Pranke, 2017-05-05 01:05:02]

https://codereview.chromium.org/2862173002/diff/1/third_party/WebKit/Tools/Sc...
File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):

https://codereview.chromium.org/2862173002/diff/1/third_party/WebKit/Tools/Sc...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:182:
rmtree(args.output_directory)
if you're actually going to ignore the error in the end, why not just pass
ignore_errors=true to shutil.rmtree() ?

[mithro, 2017-05-05 01:29:00]

On 2017/05/05 01:05:02, Dirk Pranke (slow until May 4) wrote:
>
https://codereview.chromium.org/2862173002/diff/1/third_party/WebKit/Tools/Sc...
> File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):
> 
>
https://codereview.chromium.org/2862173002/diff/1/third_party/WebKit/Tools/Sc...
> third_party/WebKit/Tools/Scripts/merge-layout-test-results:182:
> rmtree(args.output_directory)
> if you're actually going to ignore the error in the end, why not just pass
> ignore_errors=true to shutil.rmtree() ?

Because I want to try removing the directory a couple of times before giving
up...

[mithro, 2017-05-05 01:35:14]

I've reworked the error handling so that it uses the onerror function rather
than just catching the exception.

This means the code will continue to traverse rather than stopping at the first
error.

[mithro, 2017-05-05 01:35:23]

The CQ bit was checked by tansell@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-05 01:35:45]

Dry run: CQ is trying da patch.

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

[Dirk Pranke, 2017-05-05 01:49:49]

lgtm w/ comment.

https://codereview.chromium.org/2862173002/diff/20001/third_party/WebKit/Tool...
File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):

https://codereview.chromium.org/2862173002/diff/20001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:186:
rmtree(args.output_directory)
You're still ignoring the error code. You should probably either actually do
something with it, like look at it and log the warning here, or remove it.

[mithro, 2017-05-05 02:04:16]

The CQ bit was checked by tansell@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-05 02:04:54]

Dry run: CQ is trying da patch.

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

[mithro, 2017-05-05 02:28:55]

The CQ bit was checked by tansell@chromium.org to run a CQ dry run

[mithro, 2017-05-05 02:29:20]

https://codereview.chromium.org/2862173002/diff/20001/third_party/WebKit/Tool...
File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):

https://codereview.chromium.org/2862173002/diff/20001/third_party/WebKit/Tool...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:186:
rmtree(args.output_directory)
On 2017/05/05 01:49:49, Dirk Pranke wrote:
> You're still ignoring the error code. You should probably either actually do
> something with it, like look at it and log the warning here, or remove it.

Done.

[commit-bot: I haz the power, 2017-05-05 02:29:23]

Dry run: CQ is trying da patch.

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

[mithro, 2017-05-05 02:29:31]

The CQ bit was unchecked by tansell@chromium.org

[mithro, 2017-05-05 02:29:35]

The CQ bit was checked by tansell@chromium.org

[mithro, 2017-05-05 02:29:36]

The patchset sent to the CQ was uploaded after l-g-t-m from dpranke@chromium.org
Link to the patchset: https://codereview.chromium.org/2862173002/#ps60001
(title: "Output remaining contents.")

[commit-bot: I haz the power, 2017-05-05 02:29:46]

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-05-05 03:40:19]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1493951375471920,
"parent_rev": "a0999d137da9a33466efe47bc63f378000998ab1", "commit_rev":
"49345d02f5e5a10cf2789d1d45b4eeec4656b542"}

[commit-bot: I haz the power, 2017-05-05 03:40:58]

Description was changed from

==========
webkitpy: Merge script fix windows directory removing.

Attempt to remove a directory tree multiple times as on Windows a
process which is currently closing could still have a file open in the
directory.

Also continue going even if we fail to remove the directory.

The merge script currently sometimes fails on Windows with the following
error;
-------------------------
Traceback (most recent call last):
  File
"E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results",
line 185, in <module>
    main(sys.argv[1:])
  File
"E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results",
line 161, in main
    shutil.rmtree(args.output_directory)
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 256, in rmtree
    onerror(os.rmdir, path, sys.exc_info())
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 254, in rmtree
    os.rmdir(path)
WindowsError: [Error 32] The process cannot access the file because it is being
used by another process: 'E:\\b\\rr\\tmpxu2pfv\\w'
WARNING:root:merge_cmd had non-zero return code: 1
-------------------------

BUG=717347,524758
==========

to

==========
webkitpy: Merge script fix windows directory removing.

Attempt to remove a directory tree multiple times as on Windows a
process which is currently closing could still have a file open in the
directory.

Also continue going even if we fail to remove the directory.

The merge script currently sometimes fails on Windows with the following
error;
-------------------------
Traceback (most recent call last):
  File
"E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results",
line 185, in <module>
    main(sys.argv[1:])
  File
"E:\b\c\b\WebKit_Win___RandomOrder\src\third_party\WebKit\Tools\Scripts\merge-layout-test-results",
line 161, in main
    shutil.rmtree(args.output_directory)
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 256, in rmtree
    onerror(os.rmdir, path, sys.exc_info())
  File "E:\b\depot_tools\python276_bin\lib\shutil.py", line 254, in rmtree
    os.rmdir(path)
WindowsError: [Error 32] The process cannot access the file because it is being
used by another process: 'E:\\b\\rr\\tmpxu2pfv\\w'
WARNING:root:merge_cmd had non-zero return code: 1
-------------------------

BUG=717347,524758

Review-Url: https://codereview.chromium.org/2862173002
Cr-Commit-Position: refs/heads/master@{#469588}
Committed:
https://chromium.googlesource.com/chromium/src/+/49345d02f5e5a10cf2789d1d45b4...
==========

[commit-bot: I haz the power, 2017-05-05 03:40:59]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/49345d02f5e5a10cf2789d1d45b4...