Bug 1623546 [wpt PR 22328] - [WPT/common/security-features] Sort subtests to reduce diffs, a=testonly

Automatic update from web-platform-tests [WPT/common/security-features] Sort subtests to reduce diffs When `spec.src.json` is modified, the order of subtests were changed and thus unncessesary diffs were generated, even if the subtest contents are not modified. This CL sorts subtests to avoid such diffs. Generated files will be modified in https://chromium-review.googlesource.com/c/chromium/src/+/2109511 Bug: 906850 Change-Id: Ic17d8122b0b5139e89ec2b4423511b933941ad65 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109570 Reviewed-by: Kenichi Ishibashi <bashi@chromium.org> Reviewed-by: Eriko Kurimoto <elkurin@chromium.org> Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org> Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org> Cr-Commit-Position: refs/heads/master@{#751602} -- wpt-commits: 6a665f63ae39b552f60b971f11c34b215861fcb3 wpt-pr: 22328
2020-03-20 10:08:18 +00:00 · 2020-03-20 10:08:18 +00:00 · 580e42ac2e
--- a/testing/web-platform/tests/common/security-features/tools/generate.py
+++ b/testing/web-platform/tests/common/security-features/tools/generate.py
@ -198,8 +198,13 @@ def generate_test_file(spec_directory, test_helper_filenames,

    parameters = {}

-    parameters['scenarios'] = dump_test_parameters(scenarios).replace(
-        "\n", "\n" + " " * 8)
+    # Sort scenarios, to avoid unnecessary diffs due to different orders in
+    # `scenarios`.
+    serialized_scenarios = sorted(
+        [dump_test_parameters(scenario) for scenario in scenarios])
+
+    parameters['scenarios'] = ",\n".join(serialized_scenarios).replace(
+        "\n", "\n" + " " * 10)

    test_directory = os.path.dirname(test_filename)

--- a/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template
+++ b/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template
@ -15,7 +15,9 @@
  <body>
    <script>
      TestCase(
-        %(scenarios)s,
+        [
+          %(scenarios)s
+        ],
        new SanityChecker()
      ).start();
    </script>
--- a/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template
+++ b/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template
@ -11,7 +11,9 @@
  <body>
    <script>
      TestCase(
-        %(scenarios)s,
+        [
+          %(scenarios)s
+        ],
        new SanityChecker()
      ).start();
    </script>