mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-108996: fix and enable test_msvcrt (#109226)

Browse source 
* Add _testconsole.flush_console_input_buffer() function.
* test_kbhit(), test_getwch() and test_getwche() now call
  flush_console_input_buffer().
* Don't override sys.stdin anymore (not needed).
This commit is contained in:
AN Long 2023-09-22 08:19:48 +08:00 • committed by GitHub
parent 3f5c5649cf
commit 4230d7ce93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 120 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/test/test_msvcrt.py
View file

@ -2,8 +2,6 @@ import os
import sys
import unittest
raise unittest.SkipTest("FIXME! broken test see: https://github.com/python/cpython/pull/109004")
from test.support import os_helper
from test.support.os_helper import TESTFN, TESTFN_ASCII
@ -13,7 +11,7 @@ if sys.platform != "win32":
import _winapi
import msvcrt;
from _testconsole import write_input
from _testconsole import write_input, flush_console_input_buffer
class TestFileOperations(unittest.TestCase):
@ -64,6 +62,8 @@ c_encoded = b'\x57\x5b' # utf-16-le (which windows internally used) encoded char
class TestConsoleIO(unittest.TestCase):
def test_kbhit(self):
h = msvcrt.get_osfhandle(sys.stdin.fileno())
flush_console_input_buffer(h)
self.assertEqual(msvcrt.kbhit(), 0)
def test_getch(self):
@ -71,28 +71,24 @@ class TestConsoleIO(unittest.TestCase):
self.assertEqual(msvcrt.getch(), b'c')
def test_getwch(self):
stdin = open('CONIN$', 'r')
old_stdin = sys.stdin
try:
sys.stdin = stdin
write_input(stdin.buffer.raw, c_encoded)
with open('CONIN$', 'rb', buffering=0) as stdin:
h = msvcrt.get_osfhandle(stdin.fileno())
flush_console_input_buffer(h)
write_input(stdin, c_encoded)
self.assertEqual(msvcrt.getwch(), c)
finally:
sys.stdin = old_stdin
def test_getche(self):
msvcrt.ungetch(b'c')
self.assertEqual(msvcrt.getche(), b'c')
def test_getwche(self):
stdin = open('CONIN$', 'r')
old_stdin = sys.stdin
try:
sys.stdin = stdin
write_input(stdin.buffer.raw, c_encoded)
with open('CONIN$', 'rb', buffering=0) as stdin:
h = msvcrt.get_osfhandle(stdin.fileno())
flush_console_input_buffer(h)
write_input(stdin, c_encoded)
self.assertEqual(msvcrt.getwche(), c)
finally:
sys.stdin = old_stdin
def test_putch(self):
msvcrt.putch(b'c')