New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 748551 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jul 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug-Regression



Sign in to add a comment

[WPT Import] Import incorrectly exits before upload.

Project Member Reported by qyears...@chromium.org, Jul 25 2017

Issue description

This is a bug for the failures which happened over the  (which Rick was already looking at yesterday).

Example build: 

https://luci-milo.appspot.com/buildbot/chromium.infra.cron/wpt-importer/366

Log excerpt:

Import complete
Deleting any orphaned baselines.
Generating MANIFEST.json
Updating TestExpectations for any removed or renamed tests.
# ret> 1
Committing changes.
# ret> 1
# out> On branch update_wpt
# out> Your branch is ahead of 'origin/master' by 1 commit.
# out>   (use "git push" to publish your local commits)
# out> nothing to commit, working tree clean
step returned non-zero exit code: 1

I highly suspect that this is due to a bug I introduced in a recent commit.

Recent commits: https://chromium.googlesource.com/chromium/src/+log/d6a190b042fb9dfe980fae5e3a5d8ed62b7605fd/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

It appears like `self._has_changes()` is returning true but `self.run(['git', 'commit', '--all', '-F', '-'], stdin=commit_message)` exits and says there is nothing to commit.

https://cs.chromium.org/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py?l=113

I'm able to reproduce this locally and will investigate today.
 
Cc: jeffcarp@chromium.org
Status: Started (was: Assigned)
Found the reason:

In https://crrev.com/c/580574, I accidentally added an extra invocation of "git commit", meaning that the importer tries to commit two times in a row, and on the second time, it complains that there's nothing to commit.
Components: Blink>Infra>Ecosystem
Project Member

Comment 3 by bugdroid1@chromium.org, Jul 25 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b2c2e39893b9d8a68bc99dc19baa360fcba36c34

commit b2c2e39893b9d8a68bc99dc19baa360fcba36c34
Author: Quinten Yearsley <qyearsley@google.com>
Date: Tue Jul 25 18:44:41 2017

wpt-import: Remove duplicate invocation of git commit

Bug:  748551 
Change-Id: I2c64062e6ff8dab99331c09a7cb10e58c578b635
Reviewed-on: https://chromium-review.googlesource.com/584824
Reviewed-by: Jeff Carpenter <jeffcarp@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#489387}
[modify] https://crrev.com/b2c2e39893b9d8a68bc99dc19baa360fcba36c34/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

Labels: -OS-Linux
New job to see if this works now: https://luci-milo.appspot.com/buildbot/chromium.infra.cron/wpt-importer/375
Status: Fixed (was: Started)

Sign in to add a comment