Merge branch 'main' into update

Author: kripken

test/single_line_runner.py

@@ -16,14 +16,17 @@ def clearline(stream):
 
 
 def term_width():
-  return shutil.get_terminal_size()[0]
+  return shutil.get_terminal_size().columns
 
 
 class SingleLineTestResult(ColorTextResult):
   """Similar to the standard TextTestResult but uses ANSI escape codes
   for color output and reusing a single line on the terminal.
   """
-  max_status_msg = 20
+
+  # Reserve at least 20 columns for the status message
+  min_status_msg = 20
+  status_limit = None
 
   def _write_status(self, _test, status):
     # Add some color to the status message
@@ -36,7 +39,7 @@ def _write_status(self, _test, status):
       status += '\n'
     else:
       color = CYAN
-    status = status[:self.max_status_msg]
+    status = status[:self.status_limit]
     line = f'{with_color(color, status)}'
     self.stream.write(line)
     self.stream.flush()
@@ -47,12 +50,17 @@ def startTest(self, test):
     self.showAll = True
     clearline(self.stream)
     prefix_len = self.writeProgressPrefix()
-    max_desc = term_width() - prefix_len - len(' ... ') - self.max_status_msg
+    total_width = term_width()
+    max_desc = total_width - prefix_len - len(' ... ') - self.min_status_msg
     desc = str(test)[:max_desc]
     self.stream.write(desc)
     self.stream.write(' ... ')
     self.stream.flush()
 
+    # Calculate the remaining terminal width available for the _write_status
+    # message. This will never be lower than `self.max_status_msg`
+    self.status_limit = total_width - prefix_len - len(desc) - len(' ... ')
+
   def printErrors(self):
     # All tests have been run at this point so print a final newline
     # to end out status line

test/test_browser.py

@@ -5671,9 +5671,11 @@ def test_rollup(self):
     'es6': (['-sEXPORT_ES6', '--extern-post-js', test_file('modularize_post_js.js')], 9999),
   })
   def test_cross_origin(self, args, port):
-    # Verfies that the emscripten-generted JS and Wasm can be hosted on a different origin.
-    # This test create a second HTTP server running a different port that servers files from `subdir`.
-    # The main html is the servers from the normal 8888 server while the JS and Wasm are hosted
+    if '-sEXPORT_ES6' in args and browser_should_skip_feature('EMTEST_LACKS_ES6_WORKERS', Feature.WORKER_ES6_MODULES):
+      self.skipTest('This test requires a browser with ES6 Module Workers support')
+    # Verifies that the emscripten-generated JS and Wasm can be hosted on a different origin.
+    # This test creates a second HTTP server running on a different port that serves files from `subdir`.
+    # The main html is served from the normal port 8888 server while the JS and Wasm are hosted
     # on the port specified above.
     os.mkdir('subdir')
     create_file('subdir/foo.txt', 'hello')