[test] Use fetch over XMLHttpRequest for browser test reporting. NFC (#22018)

sbc100 · web-flow · commit 28c10a1c5e28 · 2024-05-30T19:47:41.000-07:00
Inspired by #22015
diff --git a/test/browser/async_bad_list.cpp b/test/browser/async_bad_list.cpp
@@ -9,20 +9,16 @@
 int main() {
   int x = EM_ASM_INT({
     window.disableErrorReporting = true;
-    window.onerror = function(e) {
+    window.onerror = async (e) => {
       var message = e.toString();
       var success = message.indexOf("unreachable") >= 0 || // firefox
                     message.indexOf("Script error.") >= 0; // chrome
       if (success && !Module.reported) {
         Module.reported = true;
         console.log("reporting success");
         // manually REPORT_RESULT; we shouldn't call back into native code at this point
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", "http://localhost:8888/report_result?0");
-        xhr.onload = xhr.onerror = function() {
-          window.close();
-        };
-        xhr.send();
+        await fetch("http://localhost:8888/report_result?0");
+        window.close();
       }
     };
     return 0;
diff --git a/test/browser/async_returnvalue.cpp b/test/browser/async_returnvalue.cpp
@@ -33,18 +33,14 @@ int main() {
 #ifdef BAD
   EM_ASM({
     window.disableErrorReporting = true;
-    window.onerror = function(e) {
+    window.onerror = async (e) => {
       var success = e.toString().indexOf("import sync_tunnel was not in ASYNCIFY_IMPORTS, but changed the state") > 0;
       if (success && !Module.reported) {
         Module.reported = true;
         console.log("reporting success");
         // manually REPORT_RESULT; we shouldn't call back into native code at this point
-        var xhr = new XMLHttpRequest();
-        xhr.open("GET", "http://localhost:8888/report_result?0");
-        xhr.onload = xhr.onerror = function() {
-          window.close();
-        };
-        xhr.send();
+        await fetch("http://localhost:8888/report_result?0");
+        window.close();
       }
     };
   });
diff --git a/test/browser/cwrap_early.js b/test/browser/cwrap_early.js
@@ -5,13 +5,11 @@ Module['preRun'] = () => {
   // doesn't actually call it
   var wrappedAdd = Module['cwrap']('add', 'number', ['number', 'number']);
   // but to call the compiled code, we must wait for the runtime
-  Module['onRuntimeInitialized'] = function() {
+  Module['onRuntimeInitialized'] = async () => {
     console.log('onRuntimeInitialized');
     if (wrappedAdd(5, 6) != 11) throw '5 + 6 should be 11';
     // report success
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', 'http://localhost:8888/report_result?0', true);
-    xhr.send();
-    setTimeout(function() { window.close() }, 1000);
+    await fetch('http://localhost:8888/report_result?0');
+    window.close();
   };
 };
diff --git a/test/browser/test_offset_converter.c b/test/browser/test_offset_converter.c
@@ -6,9 +6,7 @@ void *get_pc(void) { return __builtin_return_address(0); }
 int magic_test_function(void) {
   int result = EM_ASM_INT({
     function report(x) {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', encodeURI('http://localhost:8888?stdout=' + x));
-      xhr.send();
+      fetch(encodeURI('http://localhost:8888?stdout=' + x));
     }
     report('magic_test_function: input=' + $0);
     var converted = wasmOffsetConverter.getName($0);
diff --git a/test/browser/webgl_draw_base_vertex_base_instance_test.c b/test/browser/webgl_draw_base_vertex_base_instance_test.c
@@ -70,10 +70,7 @@ int main() {
 
   if (!extAvailable) {
     EM_ASM({
-      xhr = new XMLHttpRequest();
-      xhr.open('GET', 'http://localhost:8888/report_result?skipped:%20WEBGL_draw_instanced_base_vertex_base_instance%20is%20not%20supported!');
-      xhr.send();
-      setTimeout(function() { window.close() }, 2000);
+      fetch('http://localhost:8888/report_result?skipped:%20WEBGL_draw_instanced_base_vertex_base_instance%20is%20not%20supported!').then(() => window.close());
     });
     return 0;
   }
diff --git a/test/browser/webgl_multi_draw_test.c b/test/browser/webgl_multi_draw_test.c
@@ -60,10 +60,7 @@ int main()
 
   if (!extAvailable) {
     EM_ASM({
-      xhr = new XMLHttpRequest();
-      xhr.open('GET', 'http://localhost:8888/report_result?skipped:%20WEBGL_multi_draw%20is%20not%20supported!');
-      xhr.send();
-      setTimeout(function() { window.close() }, 2000);
+      fetch("http://localhost:8888/report_result?skipped:%20WEBGL_multi_draw%20is%20not%20supported!").then(() => windows.close());
     });
     return 0;
   }
diff --git a/test/browser_reporting.js b/test/browser_reporting.js
@@ -13,13 +13,13 @@ function reportResultToServer(result, port) {
   if ((typeof ENVIRONMENT_IS_NODE !== 'undefined' && ENVIRONMENT_IS_NODE) || (typeof ENVIRONMENT_IS_AUDIO_WORKLET !== 'undefined' && ENVIRONMENT_IS_AUDIO_WORKLET)) {
     out('RESULT: ' + result);
   } else {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', 'http://localhost:' + port + '/report_result?' + result);
-    xhr.send();
-    if (typeof window === 'object' && window && hasModule && !Module['pageThrewException']) {
-      /* for easy debugging, don't close window on failure */
-      setTimeout(function() { window.close() }, 1000);
-    }
+    let doFetch = typeof origFetch != 'undefined' ? origFetch : fetch;
+    doFetch('http://localhost:' + port + '/report_result?' + result).then(() => {
+      if (typeof window === 'object' && window && hasModule && !Module['pageThrewException']) {
+        /* for easy debugging, don't close window on failure */
+        window.close();
+      }
+    });
   }
 }
 
@@ -36,8 +36,7 @@ function reportErrorToServer(message) {
   if (typeof ENVIRONMENT_IS_NODE !== 'undefined' && ENVIRONMENT_IS_NODE) {
     err(message);
   } else {
-    xhr.open('GET', encodeURI('http://localhost:8888?stderr=' + message));
-    xhr.send();
+    fetch(encodeURI('http://localhost:8888?stderr=' + message));
   }
 }
 
diff --git a/test/canvas_animate_resize.c b/test/canvas_animate_resize.c
@@ -126,10 +126,8 @@ int main()
   if (!ctx) {
     if (!emscripten_supports_offscreencanvas()) {
       EM_ASM({
-        xhr = new XMLHttpRequest();
-        xhr.open('GET', 'http://localhost:8888/report_result?skipped:%20OffscreenCanvas%20is%20not%20supported!');
-        xhr.send();
-        setTimeout(function() { window.close() }, 2000);
+        fetch("http://localhost:8888/report_result?skipped:%20OffscreenCanvas%20is%20not%20supported!")
+        .then(() => window.close());
       });
     }
     return 0;
diff --git a/test/canvas_style_proxy_shell.html b/test/canvas_style_proxy_shell.html
@@ -151,12 +151,10 @@
         canvas.style.cursor = 'none';
       }
 
-      window.verifyCanvasStyle = function () {
+      window.verifyCanvasStyle = async () => {
         var success = Module.canvas.style.cursor === 'pointer';
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', 'http://localhost:8888/report_result?' + (success ? 1 : 0));
-        xhr.send();
-        setTimeout(function() { window.close() }, 1000);
+        await fetch('http://localhost:8888/report_result?' + (success ? 1 : 0));
+        window.close();
       }
 
     </script>
diff --git a/test/common.py b/test/common.py
@@ -1954,9 +1954,7 @@ def do_GET(self):
           To get logging to the console from browser tests, add this to
           print/printErr/the exception handler in src/shell.html:
 
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', encodeURI('http://localhost:8888?stdout=' + text));
-            xhr.send();
+            fetch(encodeURI('http://localhost:8888?stdout=' + text));
         '''
         print('[client logging:', unquote_plus(self.path), ']')
         self.send_response(200)
diff --git a/test/custom_messages_proxy_shell.html b/test/custom_messages_proxy_shell.html
@@ -16,10 +16,8 @@
       function sendResult(success) {
         if (window.sentTestResult) return;
         window.sentTestResult = true;
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', 'http://localhost:8888/report_result?' + (success ? 1 : 0));
-        xhr.send();
-        setTimeout(function() { window.close() }, 1000);
+        fetch('http://localhost:8888/report_result?' + (success ? 1 : 0))
+          .then(() => window.close());
       }
 
       var Module = {
diff --git a/test/emscripten_throw_number_pre.js b/test/emscripten_throw_number_pre.js
@@ -1,7 +1,5 @@
-addEventListener('error', function(event) {
+addEventListener('error', (event) => {
   window.disableErrorReporting = true;
   var result = event.error === 42 ? 0 : 1;
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'http://localhost:8888/report_result?' + result, true);
-  xhr.send();
+  fetch('http://localhost:8888/report_result?' + result);
 });
diff --git a/test/emscripten_throw_string_pre.js b/test/emscripten_throw_string_pre.js
@@ -1,7 +1,5 @@
-addEventListener('error', function(event) {
+addEventListener('error', (event) => {
   window.disableErrorReporting = true;
   var result = event.error === 'Hello!' ? 0 : 1;
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'http://localhost:8888/report_result?' + result, true);
-  xhr.send();
+  fetch('http://localhost:8888/report_result?' + result);
 });
diff --git a/test/hello_world_gles_shell.html b/test/hello_world_gles_shell.html
@@ -32,11 +32,9 @@
         });
         document.body.dispatchEvent(event);
       }
-      function reportResult(result) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', 'http://localhost:8888/report_gl_result?' + result, true);
-        xhr.send();
-        setTimeout(function() { window.close() }, 1000);
+      async function reportResult(result) {
+        await fetch('http://localhost:8888/report_gl_result?' + result);
+        window.close();
       }
       function doTest() {
         var firstImage = Module.canvas.toDataURL();
diff --git a/test/test_browser.py b/test/test_browser.py
@@ -176,15 +176,16 @@ def decorated(self, *args, **kwargs):
 def also_with_threads(f):
   assert callable(f)
 
-  def metafunc(self, threads, *args, **kwargs):
+  @wraps(f)
+  def decorated(self, threads, *args, **kwargs):
     if threads:
       self.emcc_args += ['-pthread']
     f(self, *args, **kwargs)
 
-  metafunc._parameterize = {'': (False,),
-                            'threads': (True,)}
+  parameterize(decorated, {'': (False,),
+                           'pthreads': (True,)})
 
-  return metafunc
+  return decorated
 
 
 def skipExecIf(cond, message):
@@ -700,16 +701,14 @@ def setup(assetLocalization):
           <center><canvas id='canvas' width='256' height='256'></canvas></center>
           <hr><div id='output'></div><hr>
           <script type='text/javascript'>
-            const handler = (event) => {
+            const handler = async (event) => {
               event.stopImmediatePropagation();
               const error = String(event instanceof ErrorEvent ? event.message : (event.reason || event));
               window.disableErrorReporting = true;
               window.onerror = null;
               var result = error.includes("test.data") ? 1 : 0;
-              var xhr = new XMLHttpRequest();
-              xhr.open('GET', 'http://localhost:8888/report_result?' + result, true);
-              xhr.send();
-              setTimeout(function() { window.close() }, 1000);
+              await fetch('http://localhost:8888/report_result?' + result);
+              window.close();
             }
             window.addEventListener('error', handler);
             window.addEventListener('unhandledrejection', handler);
@@ -1638,11 +1637,9 @@ def test_worker(self):
         Worker Test
         <script>
           var worker = new Worker('worker.js');
-          worker.onmessage = (event) => {
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', 'http://localhost:%s/report_result?' + event.data);
-            xhr.send();
-            setTimeout(function() { window.close() }, 1000);
+          worker.onmessage = async (event) => {
+            await fetch('http://localhost:%s/report_result?' + event.data);
+            window.close();
           };
         </script>
       </body>
@@ -1689,12 +1686,10 @@ def test_chunked_synchronous_xhr(self):
         <script>
           var worker = new Worker("%s");
           var buffer = [];
-          worker.onmessage = (event) => {
+          worker.onmessage = async (event) => {
             if (event.data.channel === "stdout") {
-              var xhr = new XMLHttpRequest();
-              xhr.open('GET', 'http://localhost:%s/report_result?' + event.data.line);
-              xhr.send();
-              setTimeout(function() { window.close() }, 1000);
+              await fetch('http://localhost:%s/report_result?' + event.data.line);
+              window.close();
             } else {
               if (event.data.trace) event.data.trace.split("\n").map(function(v) { console.error(v); });
               if (event.data.line) {
@@ -2450,13 +2445,11 @@ def test_runtime_misuse(self):
     post_hook = r'''
       function myJSCallback() {
         // Run on the next event loop, as code may run in a postRun right after main().
-        setTimeout(function() {
-          var xhr = new XMLHttpRequest();
+        setTimeout(async () => {
           out('done timeout noted = ' + Module.noted);
           assert(Module.noted);
-          xhr.open('GET', 'http://localhost:%s/report_result?' + HEAP32[Module.noted/4]);
-          xhr.send();
-          setTimeout(function() { window.close() }, 1000);
+          await fetch('http://localhost:%s/report_result?' + HEAP32[Module.noted/4]);
+          window.close();
         }, 0);
         // called from main, this is an ok time
         doCcall(100);
@@ -4338,7 +4331,7 @@ def test_small_js_flags(self):
     print('size:', size)
     # Note that this size includes test harness additions (for reporting the result, etc.).
     if not self.is_wasm64() and not self.is_2gb():
-      self.assertLess(abs(size - 4675), 100)
+      self.assertLess(abs(size - 4510), 100)
 
   # Tests that it is possible to initialize and render WebGL content in a
   # pthread by using OffscreenCanvas.
@@ -4962,11 +4955,10 @@ def test_browser_modularize_no_current_script(self):
       shutil.move('test.wasm', Path(filesystem_path, 'test.wasm'))
       create_file(Path(filesystem_path, 'test.html'), '''
         <script>
-          setTimeout(function() {
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', 'test.js', false);
-            xhr.send(null);
-            eval(xhr.responseText);
+          setTimeout(async () => {
+            let response = await fetch('test.js');
+            let text = await response.text();
+            eval(text);
             %s
           }, 1);
         </script>
@@ -5573,7 +5565,7 @@ def test(args, expect_fail):
       self.compile_btest('main.c', ['-fPIC', 'library.so', '-sMAIN_MODULE=2', '-sEXIT_RUNTIME', '-o', 'a.out.html'] + args)
       if expect_fail:
         js = read_file('a.out.js')
-        create_file('a.out.js', 'fetch = undefined;\n' + js)
+        create_file('a.out.js', 'let origFetch = fetch; fetch = undefined;\n' + js)
         return self.run_browser('a.out.html', '/report_result?abort:TypeError')
       else:
         return self.run_browser('a.out.html', '/report_result?exit:42')
diff --git a/test/test_fflush.html b/test/test_fflush.html
@@ -81,10 +81,7 @@
         postRun: [],
 
         reportSuccess: function() {
-          var xhr = new XMLHttpRequest();
-          xhr.open('GET', 'http://localhost:8888/report_result?0');
-          xhr.send();
-          setTimeout(function() { window.close() }, 1000);
+          fetch('http://localhost:8888/report_result?0').then(() => window.close());
         },
 
         print: (function() {

Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,10 @@`
`151`	`151`	`canvas.style.cursor = 'none';`
`152`	`152`	`}`
`153`	`153`
`154`		`- window.verifyCanvasStyle = function () {`
	`154`	`+ window.verifyCanvasStyle = async () => {`
`155`	`155`	`var success = Module.canvas.style.cursor === 'pointer';`
`156`		`- var xhr = new XMLHttpRequest();`
`157`		`- xhr.open('GET', 'http://localhost:8888/report_result?' + (success ? 1 : 0));`
`158`		`- xhr.send();`
`159`		`- setTimeout(function() { window.close() }, 1000);`
	`156`	`+ await fetch('http://localhost:8888/report_result?' + (success ? 1 : 0));`
	`157`	`+ window.close();`
`160`	`158`	`}`
`161`	`159`
`162`	`160`	`</script>`