jaseg/python-mpv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace xvfbwrapper with PyVirtualDisplay

Browse source 
Fixes #249
This commit is contained in:
Michał Górny 2023-04-30 17:02:29 +02:00 • committed by jaseg
parent 5a1a2734f2
commit 3036f64b68
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pyproject.toml
View file

@ -36,4 +36,4 @@ homepage = "https://github.com/jaseg/python-mpv"
[project.optional-dependencies] [project.optional-dependencies]
screenshot_raw = ["Pillow"] screenshot_raw = ["Pillow"]
test = ['xvfbwrapper'] test = ['PyVirtualDisplay']

2
tests/requirements.txt
View file

@ -1,2 +1,2 @@
xvfbwrapper>=0.2.9 PyVirtualDisplay>=3.0
pytest>=7.1.2 pytest>=7.1.2

32
tests/test_mpv.py
View file

@ -31,11 +31,11 @@ import mpv
if os.name == 'nt': if os.name == 'nt':
Xvfb = mock.Mock() Display = mock.Mock()
testvo='gpu' testvo='gpu'
else: else:
from xvfbwrapper import Xvfb from pyvirtualdisplay import Display
testvo='x11' testvo='x11'
@ -54,7 +54,7 @@ def timed_print():
class MpvTestCase(unittest.TestCase): class MpvTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
self.m = mpv.MPV(vo=testvo, loglevel='debug', log_handler=timed_print()) self.m = mpv.MPV(vo=testvo, loglevel='debug', log_handler=timed_print())
@ -444,7 +444,7 @@ class TestStreams(unittest.TestCase):
def test_python_stream(self): def test_python_stream(self):
handler = mock.Mock() handler = mock.Mock()
disp = Xvfb() disp = Display()
disp.start() disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
def cb(evt): def cb(evt):
@ -502,7 +502,7 @@ class TestStreams(unittest.TestCase):
stream_mock.seek = mock.Mock(return_value=0) stream_mock.seek = mock.Mock(return_value=0)
stream_mock.read = mock.Mock(return_value=b'') stream_mock.read = mock.Mock(return_value=b'')
disp = Xvfb() disp = Display()
disp.start() disp.start()
m = mpv.MPV(vo=testvo, video=False) m = mpv.MPV(vo=testvo, video=False)
def cb(evt): def cb(evt):
@ -536,7 +536,7 @@ class TestStreams(unittest.TestCase):
disp.stop() disp.stop()
def test_stream_open_exception(self): def test_stream_open_exception(self):
disp = Xvfb() disp = Display()
disp.start() disp.start()
m = mpv.MPV(vo=testvo, video=False) m = mpv.MPV(vo=testvo, video=False)
@ -572,7 +572,7 @@ class TestStreams(unittest.TestCase):
disp.stop() disp.stop()
def test_python_stream_exception(self): def test_python_stream_exception(self):
disp = Xvfb() disp = Display()
disp.start() disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
@ -610,7 +610,7 @@ class TestStreams(unittest.TestCase):
disp.stop() disp.stop()
def test_stream_open_forward(self): def test_stream_open_forward(self):
disp = Xvfb() disp = Display()
disp.start() disp.start()
m = mpv.MPV(vo=testvo, video=False) m = mpv.MPV(vo=testvo, video=False)
@ -692,7 +692,7 @@ class TestLifecycle(unittest.TestCase):
handler.assert_not_called() handler.assert_not_called()
def test_wait_for_property_negative(self): def test_wait_for_property_negative(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -715,7 +715,7 @@ class TestLifecycle(unittest.TestCase):
assert result.result() assert result.result()
def test_wait_for_property_positive(self): def test_wait_for_property_positive(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
handler = mock.Mock() handler = mock.Mock()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
@ -735,7 +735,7 @@ class TestLifecycle(unittest.TestCase):
self.disp.stop() self.disp.stop()
def test_wait_for_event(self): def test_wait_for_event(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -757,7 +757,7 @@ class TestLifecycle(unittest.TestCase):
assert result.result() assert result.result()
def test_wait_for_property_shutdown(self): def test_wait_for_property_shutdown(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -771,7 +771,7 @@ class TestLifecycle(unittest.TestCase):
@unittest.skipIf('test_wait_for_property_event_overflow' in SKIP_TESTS, reason="kills X-Server first") @unittest.skipIf('test_wait_for_property_event_overflow' in SKIP_TESTS, reason="kills X-Server first")
def test_wait_for_property_event_overflow(self): def test_wait_for_property_event_overflow(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -792,7 +792,7 @@ class TestLifecycle(unittest.TestCase):
self.disp.stop() self.disp.stop()
def test_wait_for_event_shutdown(self): def test_wait_for_event_shutdown(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -802,7 +802,7 @@ class TestLifecycle(unittest.TestCase):
self.disp.stop() self.disp.stop()
def test_wait_for_shutdown(self): def test_wait_for_shutdown(self):
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.play(TESTVID) m.play(TESTVID)
@ -814,7 +814,7 @@ class TestLifecycle(unittest.TestCase):
def test_log_handler(self): def test_log_handler(self):
handler = mock.Mock() handler = mock.Mock()
self.disp = Xvfb() self.disp = Display()
self.disp.start() self.disp.start()
m = mpv.MPV(vo=testvo, log_handler=handler) m = mpv.MPV(vo=testvo, log_handler=handler)
m.play(TESTVID) m.play(TESTVID)