Control: tags -1 + patch

Hi!

The attached patch adds to the quilt stack to fix the tests for Python 3.13. It needs to deal with makeSuite as already noted upstream, and also change assertEquals to assertEqual.

regards
Stuart



--
Stuart Prescott   http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer  http://www.debian.org/       stu...@debian.org
GPG fingerprint   90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
commit 56f9f04628b7c2c078ff4ca1f2076eeed3a0c583
Author: Stuart Prescott <stu...@debian.org>
Date:   Tue Nov 19 10:21:10 2024 +1100

    Fix unittests for Python 3.13

diff --git a/debian/patches/python3.13-unittest.patch b/debian/patches/python3.13-unittest.patch
new file mode 100644
index 0000000..dd21227
--- /dev/null
+++ b/debian/patches/python3.13-unittest.patch
@@ -0,0 +1,75 @@
+--- a/python/test_cracklib.py
++++ b/python/test_cracklib.py
+@@ -76,41 +76,41 @@
+     def test_simple_lower(self):
+         for passwd in ['t' * i for i in range(
+                 cracklib.MIN_LENGTH - cracklib.LOW_CREDIT)]:
+-            self.assertEquals(
++            self.assertEqual(
+                 1, cracklib.simple(passwd),
+                 'password {0} should be detected as too simple'.format(
+                     passwd))
+-        self.assertEquals(0, cracklib.simple(
++        self.assertEqual(0, cracklib.simple(
+             't' * (cracklib.MIN_LENGTH - cracklib.LOW_CREDIT)))
+ 
+     def test_simple_upper(self):
+         for passwd in ['T' * i for i in range(
+                 cracklib.MIN_LENGTH - cracklib.UP_CREDIT)]:
+-            self.assertEquals(
++            self.assertEqual(
+                 1, cracklib.simple(passwd),
+                 'password {0} should be detected as too simple'.format(
+                     passwd))
+-        self.assertEquals(0, cracklib.simple(
++        self.assertEqual(0, cracklib.simple(
+             'T' * (cracklib.MIN_LENGTH - cracklib.UP_CREDIT)))
+ 
+     def test_simple_digit(self):
+         for passwd in ['1' * i for i in range(
+                 cracklib.MIN_LENGTH - cracklib.DIG_CREDIT)]:
+-            self.assertEquals(
++            self.assertEqual(
+                 1, cracklib.simple(passwd),
+                 'password {0} should be detected as too simple'.format(
+                     passwd))
+-        self.assertEquals(0, cracklib.simple(
++        self.assertEqual(0, cracklib.simple(
+             '1' * (cracklib.MIN_LENGTH - cracklib.DIG_CREDIT)))
+ 
+     def test_simple_other(self):
+         for passwd in ['#' * i for i in range(
+                 cracklib.MIN_LENGTH - cracklib.OTH_CREDIT)]:
+-            self.assertEquals(
++            self.assertEqual(
+                 1, cracklib.simple(passwd),
+                 'password {0} should be detected as too simple'.format(
+                     passwd))
+-        self.assertEquals(0, cracklib.simple(
++        self.assertEqual(0, cracklib.simple(
+             '#' * (cracklib.MIN_LENGTH - cracklib.OTH_CREDIT)))
+ 
+     def test_simple_combinations(self):
+@@ -119,11 +119,11 @@
+                 cracklib.MIN_LENGTH -
+                 cracklib.LOW_CREDIT -
+                 cracklib.OTH_CREDIT)]:
+-            self.assertEquals(
++            self.assertEqual(
+                 1, cracklib.simple(passwd),
+                 'password {0} should be detected as too simple'.format(
+                     passwd))
+-        self.assertEquals(0, cracklib.simple(
++        self.assertEqual(0, cracklib.simple(
+             testset[:(cracklib.MIN_LENGTH - cracklib.LOW_CREDIT -
+                       cracklib.OTH_CREDIT)]))
+ 
+@@ -141,6 +141,7 @@
+     suite = unittest.TestSuite()
+     for cls in tests:
+         for _ in range(repeat):
+-            suite.addTest(unittest.makeSuite(cls))
++            loader = unittest.TestLoader()
++            suite.addTest(loader.loadTestsFromTestCase(cls))
+     runner = unittest.TextTestRunner(verbosity=verbosity)
+     return runner.run(suite)
diff --git a/debian/patches/series b/debian/patches/series
index b89b770..046ac8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ improve_test_737040.patch
 CVE-2016-6318.patch
 overflow-processing-long-words.patch
 fix-musl-linux-any-build
+python3.13-unittest.patch

Reply via email to