Make sure to include the port in websockets tests.

web-platform-tests · Apr 25, 2014 · b7f26e0 · b7f26e0
1 parent 6fce270
commit b7f26e0
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 20 deletions.
diff --git a/websockets/keeping-connection-open/001.html b/websockets/keeping-connection-open/001.html
@@ -8,7 +8,7 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo');
   ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()});
   ws.onopen = t.step_func(function(e) {
     setTimeout(t.step_func(function() {

diff --git a/websockets/opening-handshake/001.html b/websockets/opening-handshake/001.html
@@ -6,7 +6,7 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/invalid');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/invalid');
   ws.onclose = t.step_func(function(e) {
     assert_false(e.wasClean);
     ws.onclose = t.step_func(function() {assert_unreached()});

diff --git a/websockets/opening-handshake/002.html b/websockets/opening-handshake/002.html
@@ -7,11 +7,11 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo');
-  ws.onopen = t.step_func(function(e) {    
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo');
+  ws.onopen = t.step_func(function(e) {
     ws.onclose = t.step_func(function(e) {
       assert_equals(e.wasClean, true);
-      ws.onclose = t.step_func(function() {assert_unreached()});  
+      ws.onclose = t.step_func(function() {assert_unreached()});
       setTimeout(t.step_func(function() {t.done();}), 50)
     })
     ws.close();

diff --git a/websockets/opening-handshake/003.html b/websockets/opening-handshake/003.html
@@ -6,12 +6,12 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/origin');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/origin');
   ws.onmessage = t.step_func(function(e) {
     assert_equals(e.data, location.protocol+'//'+location.host);
     ws.onclose = t.step_func(function(e) {
       assert_equals(e.wasClean, true);
-      ws.onclose = t.step_func(function() {assert_unreached()});  
+      ws.onclose = t.step_func(function() {assert_unreached()});
       setTimeout(t.step_func(function() {t.done();}), 50)
     })
     ws.close();

diff --git a/websockets/opening-handshake/005.html b/websockets/opening-handshake/005.html
@@ -6,7 +6,7 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/simple_handshake');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/simple_handshake');
   ws.onmessage = t.step_func(function() {assert_unreached()});
   ws.onopen = t.step_func(function(e) {
     ws.onclose = t.step_func(function(e) {

diff --git a/websockets/security/001.html b/websockets/security/001.html
@@ -6,7 +6,7 @@
 <div id=log></div>
 <script>
 async_test(function(t) {
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/wrong_accept_key');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/wrong_accept_key');
   ws.onclose = function(e) {
       t.done();
   }

diff --git a/websockets/unload-a-document/001-1.html b/websockets/unload-a-document/001-1.html
@@ -5,14 +5,15 @@
 var controller = opener || parent;
 var t = controller.t;
 var assert_equals = controller.asset_equals;
-var assert_unreached = controller.assert_unreached ;
-t.add_cleanup(function() {delete sessionStorage.second_run;});
+var assert_unreached = controller.assert_unreached;
+var uuid = controller.uuid;
+t.add_cleanup(function() {delete sessionStorage[uuid];});
 t.step(function() {
-  if (sessionStorage.second_run) {
+  if (sessionStorage[uuid]) {
     t.done();
   } else {
-    sessionStorage.second_run = 'true';
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo');
+    sessionStorage[uuid] = 'true';
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo');
     ws.onopen = t.step_func(function(e) {
       setTimeout(t.step_func(function() {
         assert_unreached('document was not discarded');

diff --git a/websockets/unload-a-document/001.html b/websockets/unload-a-document/001.html
@@ -2,13 +2,16 @@
 <title>WebSockets: navigating top-level browsing context</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
 <script src=../constants.js?pipe=sub></script>
 <p>Test requires popup blocker disabled</p>
 <div id=log></div>
 <script>
 var t = async_test();
 var w;
+var uuid;
 t.step(function() {
+  uuid = token()
   w = window.open("001-1.html");
   add_result_callback(function() {
     w.close();

diff --git a/websockets/unload-a-document/002-1.html b/websockets/unload-a-document/002-1.html
@@ -6,14 +6,15 @@
 var t = controller.t;
 var assert_equals = controller.asset_equals;
 var assert_unreached = controller.assert_unreached ;
-t.add_cleanup(function() {delete sessionStorage.second_run;});
+var uuid = controller.token;
+t.add_cleanup(function() {delete sessionStorage[uuid];});
 t.step(function() {
   // this test can fail if the document is unloaded on navigation e.g. due to OOM
-  if (sessionStorage.second_run) {
+  if (sessionStorage[uuid]) {
     assert_unreached('document was discarded');
   } else {
-    sessionStorage.second_run = 'true';
-    var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo');
+    sessionStorage[uuid] = 'true';
+    var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo');
     ws.onopen = t.step_func(function(e) {
 
       setTimeout(t.step_func(function() {

diff --git a/websockets/unload-a-document/002.html b/websockets/unload-a-document/002.html
@@ -3,13 +3,16 @@
 <meta name=timeout content=long>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
 <script src=../constants.js?pipe=sub></script>
 <p>Test requires popup blocker disabled</p>
 <div id=log></div>
 <script>
 var t = async_test(null, {timeout:15000});
 var w;
+var uuid;
 t.step(function() {
+  uuid = token()
   w = window.open("002-1.html");
   add_result_callback(function() {
     w.close();

diff --git a/websockets/unload-a-document/003.html b/websockets/unload-a-document/003.html
@@ -2,9 +2,11 @@
 <title>WebSockets: navigating nested browsing context</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
 <div id=log></div>
 <script>
-var t = async_test()
+var uuid;
+var t = async_test(function() {uuid = token()});
 var navigate = t.step_func(function() {
   document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">';
 });

diff --git a/websockets/unload-a-document/004.html b/websockets/unload-a-document/004.html
@@ -3,9 +3,12 @@
 <meta name=timeout content=long>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
 <div id=log></div>
 <script>
+var uuid;
 var t = async_test(null, {timeout:15000})
+t.step(function() {uuid = token()});
 var navigate = t.step_func(function() {
   document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">';
 });

diff --git a/websockets/unload-a-document/005-1.html b/websockets/unload-a-document/005-1.html
@@ -6,7 +6,7 @@
 var assert_unreached = opener.assert_unreached;
 var hasRun = false;
 function run(){
-  var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo');
+  var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo');
   ws.onopen = t.step_func(function(e) {
     setTimeout(t.step_func(function() {
       ws.send('test');