-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cleanup WPT css-transitions timing-function parsing tests #19124
Conversation
Move all such tests into parsing. Eliminate duplicate tests and manual versions of automated tests. Change-Id: I0ef507a1832c9ce113ed1a855653af7fd22bb0b0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already reviewed downstream.
@foolip There was a final change upstream fixing a nit that never got pushed to the pull request (blink-wpt-bot desynchronized). What do we do to fix this? |
@george-steel that is pretty serious, I'm not sure if I've seen that happen before. I'll check what was landed in Chromium and make sure WPT matches. There may be a revert of changes by importing WPT in the interim, but eventually it will stabilize. |
To figure out what happened here I ran the steps for manually exporting a change in https://github.com/foolip/ecosystem-infra-rotation/blob/master/docs/export.md. Applying the changes at the same point where this was landed (7b9a8b1) leads to conflicts in css/css-transitions/parsing/transition-timing-function-invalid.html and I presume that is why @Hexcles merged in master to resolve the conflicts. Here's the conflict markers:
The first two lines come from #19195 (landed before this) and the rest are from https://chromium-review.googlesource.com/c/chromium/src/+/1809508. Both should be kept. @Hexcles resolved the conflict by doing that, just in the other order compared to the conflict markers. The remaining difference then is in css/css-transitions/parsing/transition-timing-function-computed.html, exactly as reported in #19124 (comment). That change was reverted by import in https://chromium.googlesource.com/chromium/src/+/dd5d2254250ea85d458f6e6d581f137022ca89d5. I'll send a Chromium CL to rectify this, which will then be exported too. |
I've sent https://chromium-review.googlesource.com/c/chromium/src/+/1824266/ to restore the change and filed https://bugs.chromium.org/p/chromium/issues/detail?id=1007920 about how it could happen. For anything seeing this and thinking that conflicts must be a major burden on 2-way sync, conflicts are actually very rare and not the main thing that requires human intervention. There are things that could be done to make conflicts less likely but so far that hasn't seemed like the right tradeoff. |
This part of 0d2db6e wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d225. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#699794}
This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in #19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#699794}
This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in #19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#699794}
…g-function-computed.html, a=testonly Automatic update from web-platform-tests Restore dropped test in transition-timing-function-computed.html This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#699794} -- wpt-commits: d3b1ffc4fb644e940471a781599e7f9adddb2456 wpt-pr: 19293
…g-function-computed.html, a=testonly Automatic update from web-platform-tests Restore dropped test in transition-timing-function-computed.html This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Commit-Queue: Philip Jägenstedt <foolip@chromium.org> Cr-Commit-Position: refs/heads/master@{#699794} -- wpt-commits: d3b1ffc4fb644e940471a781599e7f9adddb2456 wpt-pr: 19293
Oops, sorry I totally missed the last patchset in the CL when I tried to resolve the merge conflict -- this is exactly why one shouldn't work when on vaca :) Thanks for fixing this, @foolip . |
…g-function-computed.html, a=testonly Automatic update from web-platform-tests Restore dropped test in transition-timing-function-computed.html This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruerchromium.org> Commit-Queue: Philip Jägenstedt <foolipchromium.org> Cr-Commit-Position: refs/heads/master{#699794} -- wpt-commits: d3b1ffc4fb644e940471a781599e7f9adddb2456 wpt-pr: 19293 UltraBlame original commit: 8a4d1d4fcd915b17a590c9979c5fa58de9b70975
…g-function-computed.html, a=testonly Automatic update from web-platform-tests Restore dropped test in transition-timing-function-computed.html This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruerchromium.org> Commit-Queue: Philip Jägenstedt <foolipchromium.org> Cr-Commit-Position: refs/heads/master{#699794} -- wpt-commits: d3b1ffc4fb644e940471a781599e7f9adddb2456 wpt-pr: 19293 UltraBlame original commit: 8a4d1d4fcd915b17a590c9979c5fa58de9b70975
…g-function-computed.html, a=testonly Automatic update from web-platform-tests Restore dropped test in transition-timing-function-computed.html This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly exported in web-platform-tests/wpt#19124 and then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5. Bug: 1007920 Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824266 Reviewed-by: Stephen McGruer <smcgruerchromium.org> Commit-Queue: Philip Jägenstedt <foolipchromium.org> Cr-Commit-Position: refs/heads/master{#699794} -- wpt-commits: d3b1ffc4fb644e940471a781599e7f9adddb2456 wpt-pr: 19293 UltraBlame original commit: 8a4d1d4fcd915b17a590c9979c5fa58de9b70975
Move all such tests into parsing.
Eliminate duplicate tests and manual versions of automated tests.
Change-Id: I0ef507a1832c9ce113ed1a855653af7fd22bb0b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1809508
Commit-Queue: George Steel gtsteel@chromium.org
Auto-Submit: George Steel gtsteel@chromium.org
Reviewed-by: Stephen McGruer smcgruer@chromium.org
Cr-Commit-Position: refs/heads/master@{#699042}