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

Issue 778267 link

Starred by 1 user
Status: Fixed
Owner:
robertma@chromium.org
Closed: Oct 2017
Cc:
qyears...@chromium.org
█ lukebjerring@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 1
Type: Bug



Sign in to add a comment

[WPT import] test_importer is trying to apply a PR that was already merged upstream

Project Member Reported by raphael....@intel.com, Oct 25 2017 
See https://luci-milo.appspot.com/buildbot/chromium.infra.cron/wpt-importer/3741 (it starts at #3735).

test_importer is trying to reapply https://chromium-review.googlesource.com/c/chromium/src/+/732116 even though https://github.com/w3c/web-platform-tests/pull/7938 was already merged upstream and is part of the wpt revision it's trying to import.

I suspect this is because the GitHub pull request was adjusted and merged manually by mkwst instead of being updated and closed by chromium-wpt-export-bot, so something is still considering that the PR is still open.

Comment 1 by robertma@chromium.org, Oct 25 2017

Cc: -robertma@chromium.org
Owner: robertma@chromium.org
Status: Started (was: Available)
The manual editing results in CRLF in the commit message. The regex we use to grep Change-Id in git log is too strict and fails when there are trailing whitespaces (including CR).
Project Member

Comment 2 by bugdroid1@chromium.org, Oct 25 2017 

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

commit d4b897666ecdc274e8a1f53b0cf8d8a5539beb38
Author: Robert Ma <robertma@chromium.org>
Date: Wed Oct 25 18:29:07 2017

Loosen regex to accommodate trailing whitespaces and CRLF in git log

Two unit tests are also added to make sure we are executing the correct
commands.

Bug:  778267 
Change-Id: I9a7529e173f5a7927d72dde87ea38761f1f3e2e0
Reviewed-on: https://chromium-review.googlesource.com/738438
Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#511526}
[modify] https://crrev.com/d4b897666ecdc274e8a1f53b0cf8d8a5539beb38/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
[modify] https://crrev.com/d4b897666ecdc274e8a1f53b0cf8d8a5539beb38/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_unittest.py

Comment 3 by robertma@chromium.org, Oct 25 2017

Status: Fixed (was: Started)
We're no longer hitting the issue in the most recent run https://build.chromium.org/p/chromium.infra.cron/builders/wpt-importer/builds/3763
►

Sign in to add a comment