Bug 279206 – [WPT export friction] export-w3c-test-changes needs to handle various errors working with the wpt git repo

• Status: NEW
• Component: Tools / Tests

[Simon Fraser (smfr)]

I just had two different errors trying to run `export-w3c-test-changes -b 278753 -g b59ab1a6d619275fa32c3ee570f7b4cf0d97cd3d -c`.

The first error was:

Applying patch to web-platform-tests branch wpt-export-for-webkit-278753
Traceback (most recent call last):
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/export-w3c-test-changes", line 35, in <module>
    sys.exit(test_exporter.main(sys.argv[1:], sys.stdout, sys.stderr))
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/w3c/test_exporter.py", line 462, in main
    test_exporter.do_export()
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/w3c/test_exporter.py", line 367, in do_export
    if not self.create_branch_with_patch(git_patch_file):
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/w3c/test_exporter.py", line 297, in create_branch_with_patch
    self._git.commit(['-a', '-m', self._commit_message])
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 538, in commit
    return self._run_git(['commit'] + options)
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 78, in _run_git
    return self.run(full_command_args, **full_kwargs)
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 73, in run
    return self._executive.run_command(args,
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/common/system/executive.py", line 452, in run_command
    (error_handler or self.default_error_handler)(script_error)
  File "/Volumes/Data/Development/system/webkit/OpenSource/Tools/Scripts/webkitpy/common/system/abstractexecutive.py", line 98, in default_error_handler
    raise error
webkitpy.common.system.executive.ScriptError: Failed to run "['git', 'commit', '-a', '-m', 'WebKit export of https://bugs.webkit.org/show_bug.cgi?id=278753']" exit_code: 1 cwd: /Volumes/Data/Development/system/webkit/OpenSource/WebKitBuild/w3c-tests/web-platform-tests

What's actually happening here is:

web-platform-tests % git commit -a -m "WebKit export of https://bugs.webkit.org/show_bug.cgi?id=278753"
On branch wpt-export-for-webkit-278753
nothing to commit, working tree clean

so the changes are already in WPT, but the script didn't tell me that.

But that failure leaves me on the `wpt-export-for-webkit-278753` branch, so the next invocation says:

WARNING: Failed to run "['git', 'checkout', '-b', 'wpt-export-for-webkit-278753']" exit_code: 128 cwd: /Volumes/Data/Development/system/webkit/OpenSource/WebKitBuild/w3c-tests/web-platform-tests
Retrying to create the branch

It should have told me that the branch already existed, or the previous failure should have removed the branch and put be back on master.

[Radar WebKit Bug Importer]

<rdar://problem/135354301>