70 lines
3.2 KiB
Diff
70 lines
3.2 KiB
Diff
From 04d7211140b1ed1e0bd6b2927a0b36824febe987 Mon Sep 17 00:00:00 2001
|
|
From: Michel Alexandre Salim <michel@michel-slm.name>
|
|
Date: Fri, 5 Aug 2022 14:51:06 -0500
|
|
Subject: [PATCH] Fix Python tests for Python 3.11
|
|
|
|
The exception raised has changed:
|
|
|
|
```
|
|
======================================================================
|
|
FAIL: test_lookup_tbl (__main__.TestMethod.test_lookup_tbl)
|
|
----------------------------------------------------------------------
|
|
TypeError: int() argument must be a string, a bytes-like object or a real number, not 'NoneType'
|
|
|
|
During handling of the above exception, another exception occurred:
|
|
|
|
Traceback (most recent call last):
|
|
File "/builddir/build/BUILD/libkdumpfile-4829feb8a46e76ac2f2bc98f47b2f3f1d32300df/python/./test_addrxlat.py", line 293, in test_lookup_tbl
|
|
with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
AssertionError: "must be.* a number" does not match "int() argument must be a string, a bytes-like object or a real number, not 'NoneType'"
|
|
|
|
======================================================================
|
|
FAIL: test_step_idx (__main__.TestStep.test_step_idx)
|
|
----------------------------------------------------------------------
|
|
TypeError: int() argument must be a string, a bytes-like object or a real number, not 'NoneType'
|
|
|
|
During handling of the above exception, another exception occurred:
|
|
|
|
Traceback (most recent call last):
|
|
File "/builddir/build/BUILD/libkdumpfile-4829feb8a46e76ac2f2bc98f47b2f3f1d32300df/python/./test_addrxlat.py", line 595, in test_step_idx
|
|
with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
AssertionError: "must be.* a number" does not match "int() argument must be a string, a bytes-like object or a real number, not 'NoneType'"
|
|
```
|
|
|
|
Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
|
|
---
|
|
python/test_addrxlat.py | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/python/test_addrxlat.py b/python/test_addrxlat.py
|
|
index 7a413c2..610cb29 100644
|
|
--- a/python/test_addrxlat.py
|
|
+++ b/python/test_addrxlat.py
|
|
@@ -290,11 +290,11 @@ class TestMethod(unittest.TestCase):
|
|
meth.tbl = ((1,),)
|
|
with self.assertRaisesRegexp(ValueError, 'must be integer pairs'):
|
|
meth.tbl = ((1, 2, 3),)
|
|
- with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
+ with self.assertRaisesRegexp(TypeError, 'must be.* a .*number'):
|
|
meth.tbl = ((None, None),)
|
|
- with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
+ with self.assertRaisesRegexp(TypeError, 'must be.* a .*number'):
|
|
meth.tbl = ((1, None),)
|
|
- with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
+ with self.assertRaisesRegexp(TypeError, 'must be.* a .*number'):
|
|
meth.tbl = ((None, 1),)
|
|
|
|
def test_memarr_defaults(self):
|
|
@@ -592,7 +592,7 @@ class TestStep(unittest.TestCase):
|
|
step.idx = None
|
|
with self.assertRaisesRegexp(ValueError, 'more than [0-9]+ indices'):
|
|
step.idx = (0,) * (addrxlat.FIELDS_MAX + 2)
|
|
- with self.assertRaisesRegexp(TypeError, 'must be.* a number'):
|
|
+ with self.assertRaisesRegexp(TypeError, 'must be.* a .*number'):
|
|
step.idx = (None,)
|
|
|
|
class TestOperator(unittest.TestCase):
|
|
--
|
|
2.37.1
|
|
|