From 715682c3a8848db945f0ccf4911c3d54e591dce8 Mon Sep 17 00:00:00 2001 From: Bryan Gilbert Date: Thu, 15 Sep 2016 16:47:05 -0400 Subject: [PATCH] removed race condition possibility from auth cache test & fixed up test errors --- tests/unit/net/http_loader.rs | 2 +- tests/wpt/metadata/MANIFEST.json | 18 ++++----- .../http/basic-auth-cache-test-ref.html | 5 ++- .../http/basic-auth-cache-test.html | 37 +++++++++++++------ 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index f22dc001c6e..5530134a15c 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1533,7 +1533,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() { password: "test".to_owned(), }; - http_state.auth_cache.write().unwrap().entries.insert(url.origin().clone(), auth_entry); + http_state.auth_cache.write().unwrap().entries.insert(url.origin().clone().ascii_serialization(), auth_entry); let mut load_data = LoadData::new(LoadContext::Browsing, url, &HttpTest); load_data.credentials_flag = true; diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 8b351d14d93..4dd9d658d0a 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -37479,14 +37479,6 @@ "deleted": [], "deleted_reftests": {}, "items": { - "testharness": { - "dom/lists/DOMTokenList-Iterable.html": [ - { - "path": "dom/lists/DOMTokenList-Iterable.html", - "url": "/dom/lists/DOMTokenList-Iterable.html" - } - ] - }, "reftest": { "http/basic-auth-cache-test.html": [ { @@ -37500,10 +37492,18 @@ "url": "/http/basic-auth-cache-test.html" } ] + }, + "testharness": { + "dom/lists/DOMTokenList-Iterable.html": [ + { + "path": "dom/lists/DOMTokenList-Iterable.html", + "url": "/dom/lists/DOMTokenList-Iterable.html" + } + ] } }, "reftest_nodes": { - "http/reftest-basic-auth-cache-test.html": [ + "http/basic-auth-cache-test.html": [ { "path": "http/basic-auth-cache-test.html", "references": [ diff --git a/tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html b/tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html index 22b0deb4ebb..87e9ad509b3 100644 --- a/tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html +++ b/tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html @@ -1,6 +1,9 @@ - + + + + diff --git a/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html b/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html index b599c0925ad..f7fe2b56690 100644 --- a/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html +++ b/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html @@ -1,15 +1,30 @@ - - - -
-
+ + + + + + + + + + +