Skip to content

gh-111201: Fix event queue tests for pyrepl #118635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions Lib/test/test_pyrepl.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os
import rlcompleter
import sys
import tempfile
import unittest
from code import InteractiveConsole
from functools import partial
Expand Down Expand Up @@ -603,57 +604,63 @@ def test_global_namespace_completion(self):

@patch("_pyrepl.curses.tigetstr", lambda x: b"")
class TestUnivEventQueue(TestCase):
def setUp(self):
self.file = tempfile.TemporaryFile()

def tearDown(self) -> None:
self.file.close()

def test_get(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
event = Event("key", "a", b"a")
eq.insert(event)
self.assertEqual(eq.get(), event)

def test_empty(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
self.assertTrue(eq.empty())
eq.insert(Event("key", "a", b"a"))
self.assertFalse(eq.empty())

def test_flush_buf(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.buf.extend(b"test")
self.assertEqual(eq.flush_buf(), b"test")
self.assertEqual(eq.buf, bytearray())

def test_insert(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
event = Event("key", "a", b"a")
eq.insert(event)
self.assertEqual(eq.events[0], event)

@patch("_pyrepl.unix_eventqueue.keymap")
def test_push_with_key_in_keymap(self, mock_keymap):
mock_keymap.compile_keymap.return_value = {"a": "b"}
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {b"a": "b"}
eq.push("a")
self.assertTrue(mock_keymap.compile_keymap.called)
mock_keymap.compile_keymap.assert_called()
self.assertEqual(eq.events[0].evt, "key")
self.assertEqual(eq.events[0].data, "b")

@patch("_pyrepl.unix_eventqueue.keymap")
def test_push_without_key_in_keymap(self, mock_keymap):
mock_keymap.compile_keymap.return_value = {"a": "b"}
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {b"c": "d"}
eq.push("a")
self.assertTrue(mock_keymap.compile_keymap.called)
mock_keymap.compile_keymap.assert_called()
self.assertEqual(eq.events[0].evt, "key")
self.assertEqual(eq.events[0].data, "a")

@patch("_pyrepl.unix_eventqueue.keymap")
def test_push_with_keymap_in_keymap(self, mock_keymap):
mock_keymap.compile_keymap.return_value = {"a": "b"}
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {b"a": {b"b": "c"}}
eq.push("a")
self.assertTrue(mock_keymap.compile_keymap.called)
mock_keymap.compile_keymap.assert_called()
self.assertTrue(eq.empty())
eq.push("b")
self.assertEqual(eq.events[0].evt, "key")
Expand All @@ -665,10 +672,10 @@ def test_push_with_keymap_in_keymap(self, mock_keymap):
@patch("_pyrepl.unix_eventqueue.keymap")
def test_push_with_keymap_in_keymap_and_escape(self, mock_keymap):
mock_keymap.compile_keymap.return_value = {"a": "b"}
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {b"a": {b"b": "c"}}
eq.push("a")
self.assertTrue(mock_keymap.compile_keymap.called)
mock_keymap.compile_keymap.assert_called()
self.assertTrue(eq.empty())
eq.flush_buf()
eq.push("\033")
Expand All @@ -679,7 +686,7 @@ def test_push_with_keymap_in_keymap_and_escape(self, mock_keymap):
self.assertEqual(eq.events[1].data, "b")

def test_push_special_key(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {}
eq.push("\x1b")
eq.push("[")
Expand All @@ -688,7 +695,7 @@ def test_push_special_key(self):
self.assertEqual(eq.events[0].data, "\x1b")

def test_push_unrecognized_escape_sequence(self):
eq = EventQueue(sys.stdout.fileno(), "utf-8")
eq = EventQueue(self.file.fileno(), "utf-8")
eq.keymap = {}
eq.push("\x1b")
eq.push("[")
Expand Down
Loading