Skip to content
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

Merged
merged 2 commits into from
Sep 24, 2019

Conversation

chromium-wpt-export-bot
Copy link
Collaborator

@chromium-wpt-export-bot chromium-wpt-export-bot commented Sep 17, 2019

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}

Move all such tests into parsing.
Eliminate duplicate tests and manual versions of automated tests.

Change-Id: I0ef507a1832c9ce113ed1a855653af7fd22bb0b0
Copy link
Collaborator

@wpt-pr-bot wpt-pr-bot left a 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 foolip merged commit 31bb563 into master Sep 24, 2019
@foolip foolip deleted the chromium-export-cl-1809508 branch September 24, 2019 08:14
@george-steel
Copy link
Contributor

@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?

@foolip
Copy link
Member

foolip commented Sep 24, 2019

@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.

@foolip
Copy link
Member

foolip commented Sep 25, 2019

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:

<<<<<<< HEAD
test_invalid_value("transition-timing-function", "initial, cubic-bezier(0, -2, 1, 3)");
test_invalid_value("transition-timing-function", "cubic-bezier(0, -2, 1, 3), initial");
=======
test_invalid_value("transition-timing-function", "steps(foobar)");
test_invalid_value("transition-timing-function", "steps(3.3, end)");
test_invalid_value("transition-timing-function", "steps(3, top)");
test_invalid_value("transition-timing-function", "steps(-3, top)");
test_invalid_value("transition-timing-function", "steps(0, jump-start)");
test_invalid_value("transition-timing-function", "steps(0, jump-end)");
test_invalid_value("transition-timing-function", "steps(0, jump-both)");
test_invalid_value("transition-timing-function", "steps(1, jump-none)");

>>>>>>> cleanup WPT css-transitions timing-function parsing tests

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.

@foolip
Copy link
Member

foolip commented Sep 25, 2019

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.

chromium-wpt-export-bot pushed a commit that referenced this pull request Sep 25, 2019
This part of 0d2db6ea124f47dd9ffd8bbd1c6198f46b58e628 wasn't correctly
exported in #19124 and
then reverted by dd5d2254250ea85d458f6e6d581f137022ca89d5.

Bug: 1007920
Change-Id: I0090bfc009c1faa994323af69d2994f38d4790f4
aarongable pushed a commit to chromium/chromium that referenced this pull request Sep 25, 2019
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}
chromium-wpt-export-bot pushed a commit that referenced this pull request Sep 25, 2019
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}
chromium-wpt-export-bot pushed a commit that referenced this pull request Sep 25, 2019
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}
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Sep 30, 2019
…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
xeonchen pushed a commit to xeonchen/gecko that referenced this pull request Sep 30, 2019
…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
@Hexcles
Copy link
Member

Hexcles commented Oct 1, 2019

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 .

gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 4, 2019
…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
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 4, 2019
…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
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 5, 2019
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants