add test for main and encode ascii

Author: jadonduff

Lib/test/test_threading.py

@@ -2320,7 +2320,8 @@ def test_set_name(self):
             tests.append(os_helper.TESTFN_UNENCODABLE)
 
         if sys.platform.startswith("sunos"):
-            encoding = "utf-8"
+            # Use ASCII encoding on Solaris/Illumos/OpenIndiana
+            encoding = "ascii"
         else:
             encoding = sys.getfilesystemencoding()
 
@@ -2336,7 +2337,7 @@ def work():
                 if truncate is not None:
                     encoded = encoded[:truncate]
                 if sys.platform.startswith("sunos"):
-                    expected = encoded.decode("utf-8", "surrogateescape")
+                    expected = encoded.decode("ascii", "replace")
                 else:
                     expected = os.fsdecode(encoded)
             else:
@@ -2355,49 +2356,17 @@ def work():
                 if '\0' in expected:
                     expected = expected.split('\0', 1)[0]
 
-            with self.subTest(name=name, expected=expected):
+            with self.subTest(name=name, expected=expected, thread="main"):
+                _thread.set_name(name)
+                self.assertEqual(_thread._get_name(), expected)
+
+            with self.subTest(name=name, expected=expected, thread="worker"):
                 work_name = None
                 thread = threading.Thread(target=work, name=name)
                 thread.start()
                 thread.join()
-
-                # Detect if running on OpenIndiana / illumos
-                try:
-                    is_illumos = os.uname().version.startswith('illumos')
-                except AttributeError:
-                    is_illumos = False
-
-                if is_illumos:
-                    # illumos requires ASCII-encoded thread names
-                    if not work_name:
-                        # name didn't get set (set_name may have failed)
-                        self.skipTest(
-                            f"Platform does not support non-ASCII thread names: got empty name for {name!r}"
-                        )
-
-                    work_name_bytes = (
-                        work_name.encode('ascii', errors='ignore')
-                        if isinstance(work_name, str)
-                        else work_name
-                    )
-                    expected_bytes = expected.encode('ascii', errors='ignore')
-
-                    self.assertEqual(
-                        work_name_bytes,
-                        expected_bytes,
-                        f"{len(work_name)=} and {len(expected)=}"
-                    )
-
-                elif not name.isascii() and not work_name:
-                    # Platform does not support non-ASCII thread names
-                    self.skipTest(
-                        f"Platform does not support non-ASCII thread names: got empty name for {name!r}"
-                    )
-
-                else:
-                    # Most platforms
-                    self.assertEqual(work_name, expected,
-                                    f"{len(work_name)=} and {len(expected)=}")
+                self.assertEqual(work_name, expected,
+                                 f"{len(work_name)=} and {len(expected)=}")
 
     @unittest.skipUnless(hasattr(_thread, 'set_name'), "missing _thread.set_name")
     @unittest.skipUnless(hasattr(_thread, '_get_name'), "missing _thread._get_name")