1583012 - web-platform-tests sometimes nests the contents of the whole file in the metadata multiple times

Status: RESOLVED FIXED

(Testing :: web-platform-tests, defect, P2)

Description

[Brian Birtles (:birtles, Feb 26~ parental leave)]

e.g.

https://searchfox.org/mozilla-central/rev/962c605a9c72dcec644c05bb80c1ffe790a28037/testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini#106

(contains a nested [translate-interpolation.html] section under an existing [translate-interpolation.html] section)

produced by the merge from bug 1574607.

There are more examples in:

https://hg.mozilla.org/mozilla-central/rev/37cba102bc14

In some cases the nested block appears multiple times in the same file.

Note that I dropped a bunch of these in bug 1578125 but there may be more still left in the tree.

Comment 1

[James Graham [:jgraham]]

I think this is fallout from a bug in the mergedriver that the sync bot was using for ini files. The bug is fixed, and the driver is currently disabled for unrelated reasons. But we should clean up any leftovers in the tree; they aren't harmful but are confusing.

Note that this isn't coming from mach wpt-update so that's perfectly safe to use.

Comment 2

[James Graham [:jgraham]]

One thing to do here would be to just make mach wpt-update --full check for children of subtests and remove them when we are doing the other orphan cleanup. That would prevent people adding this kind of noise in the future.

dheiberg: Do you fancy modifying https://searchfox.org/mozilla-central/source/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py#630-645 so that we check seen_subtests for children and add them to the list to remove if any?

Comment 3

[David Heiberg [:dheiberg]]

jgraham: sure, I'll have a look at that

Comment 4

[BugBot [:suhaib / :marco/ :calixte]]

The priority flag is not set for this bug.
:jgraham, could you have a look please?

For more information, please visit auto_nag documentation.

Comment 5

[James Graham [:jgraham]]

dheiberg: Did you have an incomplete patch for this somewhere? I can try and ressurect it along with some other changes I need to make.

Comment 6

[David Heiberg [:dheiberg]]

Attachment: patch.diff

jgraham: this is what I was trying but it did not seem to work. Or I was running it incorrectly?

Comment 7

[James Graham [:jgraham]]

Attachment: Bug 1583012 - Ensure removing a node from a manifest removes the underlying tree node,

Comment 8

[James Graham [:jgraham]]

Attachment: Bug 1583012 - Remove subsubtest junk when doing a full metadata update,

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2b068107c651
Ensure removing a node from a manifest removes the underlying tree node, r=dheiberg
https://hg.mozilla.org/integration/autoland/rev/06b945715ba3
Remove subsubtest junk when doing a full metadata update, r=dheiberg

Comment 10

[Web Platform Test Sync Bot (Matrix: #interop:mozilla.org)]

Created web-platform-tests PR https://github.com/web-platform-tests/wpt/pull/19730 for changes under testing/web-platform/tests

Comment 11

[Web Platform Test Sync Bot (Matrix: #interop:mozilla.org)]

Upstream web-platform-tests status checks passed, PR will merge once commit reaches central.

Comment 12

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/2b068107c651
https://hg.mozilla.org/mozilla-central/rev/06b945715ba3

Comment 13

[Web Platform Test Sync Bot (Matrix: #interop:mozilla.org)]

Upstream PR merged by moz-wptsync-bot