[ci] Enable capture_stdio when retrying browser tests. NFC (#24207)

Author: sbc100

test/browser/test_small_js_flags.js.size

@@ -1 +1 @@
-4241
+4239

test/browser_reporting.js

@@ -3,7 +3,7 @@ var captureStdio = false;
 
 var hasModule = typeof Module === 'object' && Module;
 
-var reportingURL = 'http://localhost:8888/';
+var reportingURL = 'http://localhost:8888';
 
 async function reportResultToServer(result) {
   if (reportResultToServer.reported) {

test/common.py

@@ -2128,7 +2128,7 @@ def do_POST(self):
         self.send_response(200)
         self.end_headers()
       else:
-        print(f'do_POST: unexpected POST: {urlinfo.query}')
+        print(f'do_POST: unexpected POST: {urlinfo}')
 
     def do_GET(self):
       info = urlparse(self.path)
@@ -2317,6 +2317,10 @@ def assert_out_queue_empty(self, who):
   def run_browser(self, html_file, expected=None, message=None, timeout=None, extra_tries=1):
     if not has_browser():
       return
+    assert '?' not in html_file, 'URL params not supported'
+    url = html_file
+    if self.capture_stdio:
+      url += '?capture_stdio'
     if self.skip_exec:
       self.skipTest('skipping test execution: ' + self.skip_exec)
     if BrowserCore.unresponsive_tests >= BrowserCore.MAX_UNRESPONSIVE_TESTS:
@@ -2328,7 +2332,7 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
     if expected is not None:
       try:
         self.harness_in_queue.put((
-          'http://localhost:%s/%s' % (self.PORT, html_file),
+          'http://localhost:%s/%s' % (self.PORT, url),
           self.get_dir(),
         ))
         if timeout is None:
@@ -2357,6 +2361,9 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
             if extra_tries > 0:
               print('[test error (see below), automatically retrying]')
               print(e)
+              if not self.capture_stdio:
+                print('[enabling stdio/stderr reporting]')
+                self.capture_stdio = True
               return self.run_browser(html_file, expected, message, timeout, extra_tries - 1)
             else:
               raise e
@@ -2433,10 +2440,7 @@ def btest(self, filename, expected=None,
       output = self.run_js('test.js')
       self.assertContained('RESULT: ' + expected[0], output)
     else:
-      url = outfile
-      if self.capture_stdio:
-        url += "?capture_stdio"
-      self.run_browser(url, expected=['/report_result?' + e for e in expected], timeout=timeout, extra_tries=extra_tries)
+      self.run_browser(outfile, expected=['/report_result?' + e for e in expected], timeout=timeout, extra_tries=extra_tries)
 
 
 ###################################################################################################