fix: tests failed by wrong conflict fix

Signed-off-by: yihong0618 <zouzou0208@gmail.com>

Author: yihong0618

Lib/_pyrepl/unix_console.py

@@ -386,9 +386,10 @@ def restore(self):
         self.__maybe_write_code(self._rmkx)
         self.flushoutput()
         try:
-            tcsetattr(self.input_fd, termios.TCSADRAIN, self.__svtermstate)
-            # Reset the state for the next prepare() call.
-            self.__svtermstate = None
+            if self.__svtermstate is not None:
+                tcsetattr(self.input_fd, termios.TCSADRAIN, self.__svtermstate)
+                # Reset the state for the next prepare() call.
+                self.__svtermstate = None
         except termios.error as e:
             if e.args[0] != errno.EIO:
                 raise

Lib/test/test_pyrepl/test_unix_console.py

@@ -320,6 +320,7 @@ def test_wait_reentry_protection(self, _os_write):
 
         console._polling_thread = None
         console.restore()
+
     @unittest.skipUnless(sys.platform == "darwin", "requires macOS")
     def test_restore_with_invalid_environ_on_macos(self, _os_write):
         # gh-128636 for macOS