From 52d6b5068169120dca2c69776762b101d822fd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 4 Jan 2024 15:49:56 +0100 Subject: [PATCH] Fix imgconverter tests Legacy assertRaisesRegexp got removed, use self.assertRaisesRegex (cherry picked from commit 5dc579d070bce534b3b4d592751bd8f794b16be2) --- imgconverter/qubesimgconverter/test.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/imgconverter/qubesimgconverter/test.py b/imgconverter/qubesimgconverter/test.py index 71c363d..070290b 100644 --- a/imgconverter/qubesimgconverter/test.py +++ b/imgconverter/qubesimgconverter/test.py @@ -43,17 +43,17 @@ def test_11_get_from_stream_malformed(self): io = BytesIO('{0[0]} {0[1]}\n'.format(self.size).encode() + self.rgba[:-1]) # one byte too short - with self.assertRaisesRegexp(ValueError, 'data length violation'): + with self.assertRaisesRegex(ValueError, 'data length violation'): image = qubesimgconverter.Image.get_from_stream(io) def test_12_get_from_stream_too_big(self): io = BytesIO('{0[0]} {0[1]}\n'.format(self.size).encode() + self.rgba) # 2x2 - with self.assertRaisesRegexp(ValueError, 'size constraint violation'): + with self.assertRaisesRegex(ValueError, 'size constraint violation'): image = qubesimgconverter.Image.get_from_stream(io, max_width=1) io.seek(0) - with self.assertRaisesRegexp(ValueError, 'size constraint violation'): + with self.assertRaisesRegex(ValueError, 'size constraint violation'): image = qubesimgconverter.Image.get_from_stream(io, max_height=1) async def test_20_get_from_stream_async(self): @@ -79,19 +79,19 @@ async def test_22_get_from_stream_too_big(self): reader = asyncio.StreamReader() reader.feed_data(data) - with self.assertRaisesRegexp(ValueError, 'size constraint violation'): + with self.assertRaisesRegex(ValueError, 'size constraint violation'): image = await qubesimgconverter.Image.get_from_stream_async(reader, max_width=1) reader = asyncio.StreamReader() reader.feed_data(data) - with self.assertRaisesRegexp(ValueError, 'size constraint violation'): + with self.assertRaisesRegex(ValueError, 'size constraint violation'): image = await qubesimgconverter.Image.get_from_stream_async(reader, max_height=1) async def test_23_get_from_stream_header_too_long(self): data = '{0[0]} {0[1]}\n'.format(self.size).encode() + self.rgba # 2x2 reader = asyncio.StreamReader() reader.feed_data(b'x' * 20 + b'\n') - with self.assertRaisesRegexp(ValueError, 'Header too long'): + with self.assertRaisesRegex(ValueError, 'Header too long'): image = await qubesimgconverter.Image.get_from_stream_async(reader)