wpt_config_json should read from original config.json

[gsnedders]

cd83321

wpt_config_json should read from original config.json
https://bugs.webkit.org/show_bug.cgi?id=253602
rdar://106437906

Reviewed by Ben Nham.

This avoids any risk of a stale, copied config.json being read, as
might happen if a prior run-webkit-tests run exited uncleanly.

* Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(wpt_config_json): This function now reads from the original, non-copied file and does the mutation.
(WebPlatformTestServer._prepare_config): Make this merely call wpt_config_json and write it to the new location.

Canonical link: https://commits.webkit.org/261389@main

9430a9d

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2
✅ 🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🛠 gtk
✅ 🧪 webkitpy	🧪 api-ios	🧪 mac-wk1	❌ 🧪 gtk-wk2
	✅ 🛠 tv	🧪 mac-wk2	🧪 api-gtk
	✅ 🛠 tv-sim	🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

[webkit-early-warning-system]

EWS run on current version of this PR (hash 9430a9d)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2
✅ 🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🛠 gtk
✅ 🧪 webkitpy	🧪 api-ios	🧪 mac-wk1	❌ 🧪 gtk-wk2
	✅ 🛠 tv	🧪 mac-wk2	🧪 api-gtk
	✅ 🛠 tv-sim	🧪 mac-AS-debug-wk2
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge	✅ 🛠 watch-sim

[bnham]

Just to make sure I understand what the PR is fixing, was this the problem that was occurring?

In the past we were calling wpt_config_json() before LayoutTests/imported/w3c/web-platform-tests/config.json had been written out via start() => _prepare_config(). This means that we could read a stale LayoutTests/imported/w3c/web-platform-tests/config.json in wpt_config_json() if the server exited uncleanly.

[gsnedders]

Just to make sure I understand what the PR is fixing, was this the problem that was occurring?

In the past we were calling wpt_config_json() before LayoutTests/imported/w3c/web-platform-tests/config.json had been written out via start() => _prepare_config(). This means that we could read a stale LayoutTests/imported/w3c/web-platform-tests/config.json in wpt_config_json() if the server exited uncleanly.

Correct. (Or if something else had left a config.json there, somehow.)

Previously in base_http_url etc. we ended up in the if not config when we first called those functions, but with the stale config.json there we ended up reading the stale config.json, and in this case we didn't have the h2 key.

[webkit-commit-queue]

Committed 261389@main (cd83321): https://commits.webkit.org/261389@main

Reviewed commits have been landed. Closing PR #11255 and removing active labels.