removed race condition possibility from auth cache test & fixed up te…

…st errors
servo · bors-servo · Sep 16, 2016 · Sep 14, 2016 · Sep 14, 2016 · Sep 15, 2016
commit 715682c3a8848db945f0ccf4911c3d54e591dce8
diff --git 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

     "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": [
           {

             "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
@@ -1,6 +1,9 @@
 <!doctype html>
-<meta charset="utf-8">
 <html>
+  <head>
+    <meta charset="utf-8">
+  </head>
+
   <img src="resources/image.png">
   <img src="resources/image.png">
 </html>
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
@@ -1,15 +1,30 @@
 <!doctype html>
-<meta charset="utf-8">
-<link rel="match" href="basic-auth-cache-test-ref.html">
-<html>
-  <div id="auth"> </div>
-  <div id="noauth"> </div>
+<html id="doc" class="reftest-wait">
+  <head>
+    <meta charset="utf-8">
+  </head>
+
+  <link rel="match" href="basic-auth-cache-test-ref.html">
+
+  <img id="auth" onload="loadNoAuth()">
+  <img id="noauth" onload="removeWait()">
+
+
   <script type="text/javascript">
-    var authImg = '<img src="http://testuser:testpass@' + window.location.host + '/http/resources/securedimage.py">';
-    document.getElementById('auth').innerHTML = authImg;
-    setTimeout(function() {
-        var noAuthImg = '<img src="http://' + window.location.host + '/http/resources/securedimage.py">';
-        document.getElementById('noauth').innerHTML = noAuthImg;
-    }, 100);
+    function loadAuth() {
+        var authUrl = 'http://testuser:testpass@' + window.location.host + '/http/resources/securedimage.py';
+        document.getElementById('auth').src = authUrl;
+    }
+
+    function loadNoAuth() {
+        var noAuthUrl = 'http://' + window.location.host + '/http/resources/securedimage.py';
+        document.getElementById('noauth').src = noAuthUrl;
+    }
+
+    function removeWait() {
+        document.getElementById('doc').className = "";
+    }
+
+    window.onload = loadAuth;
   </script>
 </html>