Bug 1453987 [wpt PR 10459] - Add cookie attribute tests, a=testonly
authorFriedrich Horschig <fhorschig@chromium.org>
Tue, 01 May 2018 14:32:47 +0000
changeset 472645 8a76e542d4ec9a61d8ad53643e52f3024636442e
parent 472644 b228cc2009be9ea155a8b71ee5ec6624e9847df6
child 472646 f38318e50a9558108306b204d25b3a29779526e6
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1453987, 10459, 977923, 553497
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1453987 [wpt PR 10459] - Add cookie attribute tests, a=testonly Automatic update from web-platform-testsAdd cookie attribute tests This CL imports all attribute tests from https://github.com/abarth/http-state/tree/master/tests/data/parser. There are small changes that ensure the tests also clean up when they are run via the debug path. Change-Id: I5cf30824091471e7f65aceb19ad03bd07cfb91d1 Reviewed-on: https://chromium-review.googlesource.com/977923 Commit-Queue: Friedrich Horschig <fhorschig@chromium.org> Reviewed-by: Mike West <mkwst@chromium.org> Cr-Commit-Position: refs/heads/master@{#553497} -- wpt-commits: 3826cfb74ac2d5d3d947f81e71a08f289728c2b5 wpt-pr: 10459
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/cookies/http-state/all-tests.html
testing/web-platform/tests/cookies/http-state/attribute-tests.html
testing/web-platform/tests/cookies/http-state/general-tests.html
testing/web-platform/tests/cookies/http-state/resources/cookie-http-state-template.js
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-expected
testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -215630,16 +215630,276 @@
      {}
     ]
    ],
    "cookies/http-state/resources/test-files/0028-test": [
     [
      {}
     ]
    ],
+   "cookies/http-state/resources/test-files/attribute0001-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0001-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0002-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0002-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0003-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0003-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0004-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0004-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0005-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0005-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0006-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0006-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0007-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0007-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0008-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0008-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0009-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0009-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0010-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0010-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0011-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0011-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0012-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0012-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0013-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0013-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0014-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0014-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0015-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0015-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0016-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0016-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0017-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0017-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0018-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0018-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0019-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0019-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0020-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0020-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0021-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0021-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0022-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0022-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0023-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0023-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0024-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0024-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0025-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0025-test": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0026-expected": [
+    [
+     {}
+    ]
+   ],
+   "cookies/http-state/resources/test-files/attribute0026-test": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/echo-cookie.html": [
     [
      {}
     ]
    ],
    "cookies/resources/echo-json.py": [
     [
      {}
@@ -313294,19 +313554,25 @@
     ]
    ],
    "cookie-store/serviceworker_cookieStore_basic.tentative.https.html": [
     [
      "/cookie-store/serviceworker_cookieStore_basic.tentative.https.html",
      {}
     ]
    ],
-   "cookies/http-state/all-tests.html": [
-    [
-     "/cookies/http-state/all-tests.html",
+   "cookies/http-state/attribute-tests.html": [
+    [
+     "/cookies/http-state/attribute-tests.html",
+     {}
+    ]
+   ],
+   "cookies/http-state/general-tests.html": [
+    [
+     "/cookies/http-state/general-tests.html",
      {}
     ]
    ],
    "cookies/meta-blocked.html": [
     [
      "/cookies/meta-blocked.html",
      {}
     ]
@@ -427335,22 +427601,26 @@
   "cookies/OWNERS": [
    "15417c1a9e90762ae826b0258fe3619cc6a78b0e",
    "support"
   ],
   "cookies/README.md": [
    "1949878db1be4093ec8d9595710f9fd8887434ba",
    "support"
   ],
-  "cookies/http-state/all-tests.html": [
+  "cookies/http-state/attribute-tests.html": [
+   "54fff0b4c9b2e0a86bf44d371c58f2f5fa06e77b",
+   "testharness"
+  ],
+  "cookies/http-state/general-tests.html": [
    "4e030633623184b3e5705d312294412b96f28bf7",
    "testharness"
   ],
   "cookies/http-state/resources/cookie-http-state-template.js": [
-   "2e096943b9071f912adf4b3fec3ecae8e6b68118",
+   "51220e910527585bd82540d51e9a53d872b62fa7",
    "support"
   ],
   "cookies/http-state/resources/cookie-setter.py": [
    "693d8ec6f340275e978db3ad9a8472c411ac733f",
    "support"
   ],
   "cookies/http-state/resources/debugging-single-test.html.py-str": [
    "654fd1e28ddb80d348177156be6891a69151bf35",
@@ -427583,16 +427853,224 @@
   "cookies/http-state/resources/test-files/0028-expected": [
    "b0e7f6e71e828d978b9cba6b78666313db236ac9",
    "support"
   ],
   "cookies/http-state/resources/test-files/0028-test": [
    "b0e7f6e71e828d978b9cba6b78666313db236ac9",
    "support"
   ],
+  "cookies/http-state/resources/test-files/attribute0001-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0001-test": [
+   "4cc07c18a453ca841b5d43b41822b3bfe5d369b9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0002-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0002-test": [
+   "af14d98878469b7a896577a9b486d9878ed05b42",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0003-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0003-test": [
+   "0aa5065e1ea41c9244a2608d119747bfa9e3ecac",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0004-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0004-test": [
+   "2f6d041c717dd90df73941808f1adce4a37a37c1",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0005-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0005-test": [
+   "e441b3f6cbb72921723d8ff6d9db614d08568923",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0006-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0006-test": [
+   "f4f873a5ef6e0c807ecf4afbcfef42eed6e2aafd",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0007-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0007-test": [
+   "c2f1b5cb92ce78c426535c9eb9a86e92cf511c5a",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0008-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0008-test": [
+   "f76fbfc9eb2993d83b73932ad974097fb7418a15",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0009-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0009-test": [
+   "744ac0817b06cf60766ce15b388249ac0971ef40",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0010-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0010-test": [
+   "303a5aa71acaacfcb456d2da761ef969a966fa69",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0011-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0011-test": [
+   "e551222d4fa39a4598effda5f41b5de6c8e1b577",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0012-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0012-test": [
+   "a031c7c2d765673abbf173e89c6d558e15f348db",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0013-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0013-test": [
+   "e7af829978c9d01b9c53335385dd96f02776c146",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0014-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0014-test": [
+   "2f2dfe9b3f936a4401549cbfe88afc0c23fd1569",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0015-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0015-test": [
+   "31b16d2486e80bae0e460f85107c19f701691fbb",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0016-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0016-test": [
+   "34c55b399322993ec73e07b731778acdde5d5699",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0017-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0017-test": [
+   "0dedb0b6a2c94ef869bbeb3ec7121af4a38e7ab1",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0018-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0018-test": [
+   "6fc50bed0c446214237e0473be21b210de6625d9",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0019-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0019-test": [
+   "20b46eb909dc8e1728ace09f7114db1163e346d7",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0020-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0020-test": [
+   "bcfc752e317a32f0b566a57df27d61afed995861",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0021-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0021-test": [
+   "c4fc5ac0d82c344186c213c4276772c9ee8c4771",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0022-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0022-test": [
+   "eb8b3e072b67996f3dbb20e342a7233ddf535e76",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0023-expected": [
+   "2017a6b45d4929c7f8ebbbaca36331cc11199f88",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0023-test": [
+   "3811352ccfe19da2d6d3983d1ac3a09787676b44",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0024-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0024-test": [
+   "72c212f0770ceb9dd27c183c0ad80725c2bfc4a3",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0025-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0025-test": [
+   "c45446b6030136b2c3355a40f9286512d8776e0f",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0026-expected": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "cookies/http-state/resources/test-files/attribute0026-test": [
+   "5a492442aac6889863c9071a18cf077d6adaed17",
+   "support"
+  ],
   "cookies/meta-blocked.html": [
    "1ece2f38a340ff4ff4713ada5568281d0e1c5be2",
    "testharness"
   ],
   "cookies/path/match.html": [
    "a54ac9afd9c176da2c8844389feb3cb0150fcf5c",
    "testharness"
   ],
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/attribute-tests.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Tests cookie attribute functionality</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
+
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/cookie-http-state-template.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+      setup({ explicit_timeout: true });
+
+      const TEST_CASES = [
+        {file: "attribute0001", name: "Ignore cookie for Secure attribute."},
+        {file: "attribute0002", name: "Ignore cookie for seCURe attribute."},
+        {file: "attribute0003", name: "Set cookie for \"Secure\" attribute."},
+        {file: "attribute0004", name: "Ignore cookie for for Secure= attribute."},
+        {file: "attribute0005", name: "Ignore cookie for Secure=aaaa"},
+        {file: "attribute0006", name: "Set cookie for Secure qux"},
+        {file: "attribute0007", name: "Ignore cookie for Secure space equals."},
+        {file: "attribute0008", name: "Ignore cookie for Secure equals space"},
+        {file: "attribute0009", name: "Ignore cookie for Secure separated."},
+        {file: "attribute0010", name: "Ignore cookie for Secure separated v2."},
+        {file: "attribute0011", name: "Ignore cookie for Secure separated v2."},
+        {file: "attribute0012", name: "Ignore cookie for spaced Secure"},
+        {file: "attribute0013", name: "Ignore cookie for space Secure with ;."},
+        {file: "attribute0014", name: "Set cookie for Path."},
+        {file: "attribute0015", name: "Set cookie for Path=."},
+        {file: "attribute0016", name: "Set cookie for Path=/."},
+        {file: "attribute0017", name: "Ignore cookie for invalid path."},
+        {file: "attribute0018", name: "Ignore cookie for spaced invalid path."},
+        {file: "attribute0019", name: "Ignore cookie for spaced invalid path v2."},
+        {file: "attribute0020", name: "Ignore cookie for invalid path and attribute."},
+        {file: "attribute0021", name: "Ignore cookie for invalid and root path."},
+        {file: "attribute0022", name: "Set cookie for root and invalid path."},
+        {file: "attribute0023", name: "Set cookie for invalid and sane path."},
+        {file: "attribute0024", name: "Ignore cookie for sane and invalid path."},
+        {file: "attribute0025", name: "Ignore cookie for invalid + Secure."},
+        {file: "attribute0026", name: "Ignore cookie for quoted invalid attribute."},
+      ];
+
+      for (const i in TEST_CASES) {
+        const t = TEST_CASES[i];
+        promise_test(createCookieTest(t.file),
+                     t.file + " - " + t.name,
+                     { timeout: 3000 });
+      }
+
+    </script>
+  </body>
+</html>
rename from testing/web-platform/tests/cookies/http-state/all-tests.html
rename to testing/web-platform/tests/cookies/http-state/general-tests.html
--- a/testing/web-platform/tests/cookies/http-state/resources/cookie-http-state-template.js
+++ b/testing/web-platform/tests/cookies/http-state/resources/cookie-http-state-template.js
@@ -1,21 +1,26 @@
 const SERVER_LOCATION = "resources";
 const SERVER_SCRIPT = SERVER_LOCATION + "/cookie-setter.py";
 
 function stripPrefixAndWhitespace(cookie_text) {
   return cookie_text.replace(/^Cookie: /, '').replace(/^\s+|\s+$/g, '');
 }
 
 function getLocalResourcesPath() {
-  return location.pathname.replace(/[^\/]*$/, "") + SERVER_LOCATION;
+  let replace = "(" + SERVER_LOCATION + "\/)*";  // Redundant location.
+  replace += "[^\/]*$";  // Everything after the last "/".
+  return location.pathname.replace(new RegExp(replace), "") + SERVER_LOCATION;
 }
 
 function getAbsoluteServerLocation() {
-  return getLocalResourcesPath().replace(/resources.*$/,'')+ SERVER_SCRIPT;
+  // Replace the server location and everything coming after it ...
+  let replace = SERVER_LOCATION + ".*$";
+  // ... with the Server script (which includes the server location).
+  return getLocalResourcesPath().replace(new RegExp(replace),'')+ SERVER_SCRIPT;
 }
 
 function expireCookie(name, expiry_date, path) {
   name = name || "";
   expiry_date = expiry_date || "Thu, 01 Jan 1970 00:00:00 UTC";
   path = path || getLocalResourcesPath();
   document.cookie = name + "=; expires=" + expiry_date + "; path=" + path + ";";
 }
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; seCURe
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; "Secure"
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure=
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure=aaaa
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure =aaaaa
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure= aaaaa
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure; qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure;qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Secure    ; qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar;                Secure
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar;       Secure     ;
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path    =/qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=    /qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/qux      ; taz
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/qux; Path=/
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/; Path=/qux
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-expected
@@ -0,0 +1,1 @@
+Cookie: foo=bar
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/qux; Path=/cookie-parser-result
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; Path=/cookie-parser-result; Path=/qux
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; qux; Secure
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test
@@ -0,0 +1,1 @@
+Set-Cookie: foo=bar; qux="aaa;bbb"; Secure