gh-152297: Update lazy import test expectations

Author: 1sgtpepper

Lib/test/test_lazy_import/__init__.py

@@ -755,14 +755,15 @@ class ErrorHandlingTests(LazyImportTestCase):
     """
 
     def test_import_error_shows_chained_traceback(self):
-        """Accessing a nonexistent lazy submodule via parent attr raises AttributeError."""
+        """A failed dotted lazy import should preserve the import failure."""
         code = textwrap.dedent("""
             import sys
             lazy import test.test_lazy_import.data.nonexistent_module
 
             try:
                 x = test.test_lazy_import.data.nonexistent_module
-            except AttributeError as e:
+            except ModuleNotFoundError as e:
+                assert e.__cause__ is not None, "Expected chained exception"
                 print("OK")
         """)
         result = subprocess.run(
@@ -807,20 +808,22 @@ def test_reification_retries_on_failure(self):
 
             lazy import test.test_lazy_import.data.broken_module
 
+            def lazy_proxy():
+                return globals()['test']
+
             # First access - should fail
             try:
                 x = test.test_lazy_import.data.broken_module
-            except AttributeError:
+            except ValueError:
                 pass
 
-            # The lazy object should still be a lazy proxy (not reified)
-            g = globals()
-            lazy_obj = g['test']
-            # The root 'test' binding should still allow retry
+            assert type(lazy_proxy()) is types.LazyImportType
+
             # Second access - should also fail (retry the import)
             try:
                 x = test.test_lazy_import.data.broken_module
-            except AttributeError:
+            except ValueError:
+                assert type(lazy_proxy()) is types.LazyImportType
                 print("OK - retry worked")
         """)
         result = subprocess.run(
@@ -840,7 +843,8 @@ def test_error_during_module_execution_propagates(self):
             try:
                 _ = test.test_lazy_import.data.broken_module
                 print("FAIL - should have raised")
-            except AttributeError:
+            except ValueError as e:
+                assert str(e) == "This module always fails to import"
                 print("OK")
         """)
         result = subprocess.run(

Lib/test/test_traceback.py

@@ -5609,24 +5609,43 @@ def _make_syntax_error(text, offset, end_offset):
 class TestLazyImportSuggestions(unittest.TestCase):
     """Test that lazy imports are not reified when computing AttributeError suggestions."""
 
+    @staticmethod
+    def lazy_holder_script(body):
+        setup = textwrap.dedent("""
+            import atexit
+            import os
+            import shutil
+            import sys
+            import tempfile
+
+            tmpdir = tempfile.mkdtemp()
+            atexit.register(shutil.rmtree, tmpdir, ignore_errors=True)
+            with open(os.path.join(tmpdir, "lazy_traceback_bar.py"),
+                      "w", encoding="utf-8") as f:
+                f.write('print("BAR_MODULE_LOADED")\\n')
+            with open(os.path.join(tmpdir, "lazy_holder.py"),
+                      "w", encoding="utf-8") as f:
+                f.write("lazy import lazy_traceback_bar\\n")
+
+            sys.path.insert(0, tmpdir)
+            import lazy_holder
+        """)
+        return setup + textwrap.dedent(body)
+
     def test_attribute_error_does_not_reify_lazy_imports(self):
         """Printing an AttributeError should not trigger lazy import reification."""
-        # pkg.bar prints "BAR_MODULE_LOADED" when imported.
-        # If lazy import is reified during suggestion computation, we'll see it.
-        code = textwrap.dedent("""
-            lazy import test.test_lazy_import.data.pkg.bar
-            test.test_lazy_import.data.pkg.nonexistent
+        code = self.lazy_holder_script("""
+            lazy_holder.nonexistent
         """)
         rc, stdout, stderr = assert_python_failure('-c', code)
         self.assertNotIn(b"BAR_MODULE_LOADED", stdout)
 
     def test_traceback_formatting_does_not_reify_lazy_imports(self):
         """Formatting a traceback should not trigger lazy import reification."""
-        code = textwrap.dedent("""
+        code = self.lazy_holder_script("""
             import traceback
-            lazy import test.test_lazy_import.data.pkg.bar
             try:
-                test.test_lazy_import.data.pkg.nonexistent
+                lazy_holder.nonexistent
             except AttributeError:
                 traceback.format_exc()
             print("OK")
@@ -5637,10 +5656,8 @@ def test_traceback_formatting_does_not_reify_lazy_imports(self):
 
     def test_suggestion_still_works_for_non_lazy_attributes(self):
         """Suggestions should still work for non-lazy module attributes."""
-        code = textwrap.dedent("""
-            lazy import test.test_lazy_import.data.pkg.bar
-            # Typo for __name__
-            test.test_lazy_import.data.pkg.__nme__
+        code = self.lazy_holder_script("""
+            lazy_holder.__nme__
         """)
         rc, stdout, stderr = assert_python_failure('-c', code)
         self.assertIn(b"__name__", stderr)