From 772cd6e9cc0ee5b9e802268e265d88149420feb8 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Thu, 22 Apr 2021 22:04:25 -0400 Subject: [PATCH 1/3] Add test_userlist from CPython 3.8 --- Lib/test/test_userlist.py | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Lib/test/test_userlist.py diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py new file mode 100644 index 000000000..1ed67dac8 --- /dev/null +++ b/Lib/test/test_userlist.py @@ -0,0 +1,69 @@ +# Check every path through every method of UserList + +from collections import UserList +from test import list_tests +import unittest + +class UserListTest(list_tests.CommonTest): + type2test = UserList + + def test_getslice(self): + super().test_getslice() + l = [0, 1, 2, 3, 4] + u = self.type2test(l) + for i in range(-3, 6): + self.assertEqual(u[:i], l[:i]) + self.assertEqual(u[i:], l[i:]) + for j in range(-3, 6): + self.assertEqual(u[i:j], l[i:j]) + + def test_slice_type(self): + l = [0, 1, 2, 3, 4] + u = UserList(l) + self.assertIsInstance(u[:], u.__class__) + self.assertEqual(u[:],u) + + def test_add_specials(self): + u = UserList("spam") + u2 = u + "eggs" + self.assertEqual(u2, list("spameggs")) + + def test_radd_specials(self): + u = UserList("eggs") + u2 = "spam" + u + self.assertEqual(u2, list("spameggs")) + u2 = u.__radd__(UserList("spam")) + self.assertEqual(u2, list("spameggs")) + + def test_iadd(self): + super().test_iadd() + u = [0, 1] + u += UserList([0, 1]) + self.assertEqual(u, [0, 1, 0, 1]) + + def test_mixedcmp(self): + u = self.type2test([0, 1]) + self.assertEqual(u, [0, 1]) + self.assertNotEqual(u, [0]) + self.assertNotEqual(u, [0, 2]) + + def test_mixedadd(self): + u = self.type2test([0, 1]) + self.assertEqual(u + [], u) + self.assertEqual(u + [2], [0, 1, 2]) + + def test_getitemoverwriteiter(self): + # Verify that __getitem__ overrides *are* recognized by __iter__ + class T(self.type2test): + def __getitem__(self, key): + return str(key) + '!!!' + self.assertEqual(next(iter(T((1,2)))), "0!!!") + + def test_userlist_copy(self): + u = self.type2test([6, 8, 1, 9, 1]) + v = u.copy() + self.assertEqual(u, v) + self.assertEqual(type(u), type(v)) + +if __name__ == "__main__": + unittest.main() From 36314ea2e2923b3d8b2477f7501d2c5280569400 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Thu, 22 Apr 2021 22:08:43 -0400 Subject: [PATCH 2/3] Mark failing/unexpectedly passing tests --- Lib/test/test_userlist.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py index 1ed67dac8..4e52d5c5e 100644 --- a/Lib/test/test_userlist.py +++ b/Lib/test/test_userlist.py @@ -7,6 +7,14 @@ import unittest class UserListTest(list_tests.CommonTest): type2test = UserList + # TODO: RUSTPYTHON, parent method is marked but this version passes + def test_init(self): + super().test_init() + + # TODO: RUSTPYTHON, parent method is marked but this version passes + def test_repr_deep(self): + super().test_repr_deep() + def test_getslice(self): super().test_getslice() l = [0, 1, 2, 3, 4] @@ -17,6 +25,8 @@ class UserListTest(list_tests.CommonTest): for j in range(-3, 6): self.assertEqual(u[i:j], l[i:j]) + # TODO: RUSTPYTHON + @unittest.expectedFailure def test_slice_type(self): l = [0, 1, 2, 3, 4] u = UserList(l) From 93898e840297c1ccd27ac3f2ad91f9fe6fe2740d Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Thu, 10 Jun 2021 21:14:29 -0400 Subject: [PATCH 3/3] Mark unexpected panic on Windows --- Lib/test/test_userlist.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py index 4e52d5c5e..26752353a 100644 --- a/Lib/test/test_userlist.py +++ b/Lib/test/test_userlist.py @@ -12,6 +12,8 @@ class UserListTest(list_tests.CommonTest): super().test_init() # TODO: RUSTPYTHON, parent method is marked but this version passes + import sys + @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, unexpectedly panics somewhere") def test_repr_deep(self): super().test_repr_deep()