pyrox.dev
1From f3fcc2319d96dde3618e3629534d16b4b2d49423 Mon Sep 17 00:00:00 2001
2From: Florian Klink <flokli@flokli.de>
3Date: Tue, 1 Apr 2025 15:46:37 +0100
4Subject: [PATCH 1/2] parser_tests: replace self.assert_ with specific
5 assertions
6
7This function does not exist (anymore?), use assert methods suitable for
8each type of check.
9---
10 tests/parser_tests.py | 54 +++++++++++++++++++++----------------------
11 1 file changed, 27 insertions(+), 27 deletions(-)
12
13diff --git a/tests/parser_tests.py b/tests/parser_tests.py
14index 12fb9ac..af93fba 100644
15--- a/tests/parser_tests.py
16+++ b/tests/parser_tests.py
17@@ -13,14 +13,14 @@ class RedisParserTestCase(unittest.TestCase):
18
19 def test_empty_rdb(self):
20 r = load_rdb('empty_database.rdb')
21- self.assert_('start_rdb' in r.methods_called)
22- self.assert_('end_rdb' in r.methods_called)
23+ self.assertIn('start_rdb', r.methods_called)
24+ self.assertIn('end_rdb', r.methods_called)
25 self.assertEquals(len(r.databases), 0, msg = "didn't expect any databases")
26
27 def test_multiple_databases(self):
28 r = load_rdb('multiple_databases.rdb')
29- self.assert_(len(r.databases), 2)
30- self.assert_(1 not in r.databases)
31+ self.assertEqual(len(r.databases), 2)
32+ self.assertNotIn(1, r.databases)
33 self.assertEquals(r.databases[0][b"key_in_zeroth_database"], b"zero")
34 self.assertEquals(r.databases[2][b"key_in_second_database"], b"second")
35
36@@ -105,9 +105,9 @@ class RedisParserTestCase(unittest.TestCase):
37 def test_ziplist_that_doesnt_compress(self):
38 r = load_rdb('ziplist_that_doesnt_compress.rdb')
39 self.assertEquals(r.lengths[0][b"ziplist_doesnt_compress"], 2)
40- self.assert_(b"aj2410" in r.databases[0][b"ziplist_doesnt_compress"])
41- self.assert_(b"cc953a17a8e096e76a44169ad3f9ac87c5f8248a403274416179aa9fbd852344"
42- in r.databases[0][b"ziplist_doesnt_compress"])
43+ self.assertIn(b"aj2410", r.databases[0][b"ziplist_doesnt_compress"])
44+ self.assertIn(b"cc953a17a8e096e76a44169ad3f9ac87c5f8248a403274416179aa9fbd852344",
45+ r.databases[0][b"ziplist_doesnt_compress"])
46
47 def test_ziplist_with_integers(self):
48 r = load_rdb('ziplist_with_integers.rdb')
49@@ -121,45 +121,45 @@ class RedisParserTestCase(unittest.TestCase):
50 self.assertEquals(r.lengths[0][b"ziplist_with_integers"], len(expected_numbers))
51
52 for num in expected_numbers :
53- self.assert_(num in r.databases[0][b"ziplist_with_integers"], "Cannot find %d" % num)
54+ self.assertIn(num, r.databases[0][b"ziplist_with_integers"], "Cannot find %d" % num)
55
56 def test_linkedlist(self):
57 r = load_rdb('linkedlist.rdb')
58 self.assertEquals(r.lengths[0][b"force_linkedlist"], 1000)
59- self.assert_(b"JYY4GIFI0ETHKP4VAJF5333082J4R1UPNPLE329YT0EYPGHSJQ" in r.databases[0][b"force_linkedlist"])
60- self.assert_(b"TKBXHJOX9Q99ICF4V78XTCA2Y1UYW6ERL35JCIL1O0KSGXS58S" in r.databases[0][b"force_linkedlist"])
61+ self.assertIn(b"JYY4GIFI0ETHKP4VAJF5333082J4R1UPNPLE329YT0EYPGHSJQ", r.databases[0][b"force_linkedlist"])
62+ self.assertIn(b"TKBXHJOX9Q99ICF4V78XTCA2Y1UYW6ERL35JCIL1O0KSGXS58S", r.databases[0][b"force_linkedlist"])
63
64 def test_intset_16(self):
65 r = load_rdb('intset_16.rdb')
66 self.assertEquals(r.lengths[0][b"intset_16"], 3)
67 for num in (0x7ffe, 0x7ffd, 0x7ffc) :
68- self.assert_(num in r.databases[0][b"intset_16"])
69+ self.assertIn(num, r.databases[0][b"intset_16"])
70
71 def test_intset_32(self):
72 r = load_rdb('intset_32.rdb')
73 self.assertEquals(r.lengths[0][b"intset_32"], 3)
74 for num in (0x7ffefffe, 0x7ffefffd, 0x7ffefffc) :
75- self.assert_(num in r.databases[0][b"intset_32"])
76+ self.assertIn(num, r.databases[0][b"intset_32"])
77
78 def test_intset_64(self):
79 r = load_rdb('intset_64.rdb')
80 self.assertEquals(r.lengths[0][b"intset_64"], 3)
81 for num in (0x7ffefffefffefffe, 0x7ffefffefffefffd, 0x7ffefffefffefffc) :
82- self.assert_(num in r.databases[0][b"intset_64"])
83+ self.assertIn(num, r.databases[0][b"intset_64"])
84
85 def test_regular_set(self):
86 r = load_rdb('regular_set.rdb')
87 self.assertEquals(r.lengths[0][b"regular_set"], 6)
88 for member in (b"alpha", b"beta", b"gamma", b"delta", b"phi", b"kappa") :
89- self.assert_(member in r.databases[0][b"regular_set"], msg=('%s missing' % member))
90+ self.assertIn(member, r.databases[0][b"regular_set"], msg=('%s missing' % member))
91
92 def test_sorted_set_as_ziplist(self):
93 r = load_rdb('sorted_set_as_ziplist.rdb')
94 self.assertEquals(r.lengths[0][b"sorted_set_as_ziplist"], 3)
95 zset = r.databases[0][b"sorted_set_as_ziplist"]
96- self.assert_(floateq(zset[b'8b6ba6718a786daefa69438148361901'], 1))
97- self.assert_(floateq(zset[b'cb7a24bb7528f934b841b34c3a73e0c7'], 2.37))
98- self.assert_(floateq(zset[b'523af537946b79c4f8369ed39ba78605'], 3.423))
99+ self.assertTrue(floateq(zset[b'8b6ba6718a786daefa69438148361901'], 1))
100+ self.assertTrue(floateq(zset[b'cb7a24bb7528f934b841b34c3a73e0c7'], 2.37))
101+ self.assertTrue(floateq(zset[b'523af537946b79c4f8369ed39ba78605'], 3.423))
102
103 def test_filtering_by_keys(self):
104 r = load_rdb('parser_filters.rdb', filters={"keys":"k[0-9]"})
105@@ -169,16 +169,16 @@ class RedisParserTestCase(unittest.TestCase):
106
107 def test_filtering_by_type(self):
108 r = load_rdb('parser_filters.rdb', filters={"types":["sortedset"]})
109- self.assert_(b'z1' in r.databases[0])
110- self.assert_(b'z2' in r.databases[0])
111- self.assert_(b'z3' in r.databases[0])
112- self.assert_(b'z4' in r.databases[0])
113+ self.assertIn(b'z1', r.databases[0])
114+ self.assertIn(b'z2', r.databases[0])
115+ self.assertIn(b'z3', r.databases[0])
116+ self.assertIn(b'z4', r.databases[0])
117 self.assertEquals(len(r.databases[0]), 4)
118
119 def test_filtering_by_database(self):
120 r = load_rdb('multiple_databases.rdb', filters={"dbs":[2]})
121- self.assert_(b'key_in_zeroth_database' not in r.databases[0])
122- self.assert_(b'key_in_second_database' in r.databases[2])
123+ self.assertNotIn(b'key_in_zeroth_database', r.databases[0])
124+ self.assertIn(b'key_in_second_database', r.databases[2])
125 self.assertEquals(len(r.databases[0]), 0)
126 self.assertEquals(len(r.databases[2]), 1)
127
128@@ -195,12 +195,12 @@ class RedisParserTestCase(unittest.TestCase):
129 self.assertEquals(r.databases[0][b'foo'], b'bar')
130 zset = r.databases[0][b"bigset"]
131 self.assertEquals(len(zset), 1000)
132- self.assert_(floateq(zset[b'finalfield'], 2.718))
133+ self.assertTrue(floateq(zset[b'finalfield'], 2.718))
134
135 def test_multiple_databases_stream(self):
136 r = load_rdb_stream('multiple_databases.rdb')
137- self.assert_(len(r.databases), 2)
138- self.assert_(1 not in r.databases)
139+ self.assertEquals(len(r.databases), 2)
140+ self.assertNotIn(1, r.databases)
141 self.assertEquals(r.databases[0][b"key_in_zeroth_database"], b"zero")
142 self.assertEquals(r.databases[2][b"key_in_second_database"], b"second")
143
144@@ -210,7 +210,7 @@ class RedisParserTestCase(unittest.TestCase):
145
146 def test_rdb_version_8_with_module_and_skip(self):
147 r = load_rdb('redis_40_with_module.rdb', {"keys": "bar"}) # skip foo module
148- self.assert_(b'foo' not in r.databases[0])
149+ self.assertNotIn(b'foo', r.databases[0])
150
151 def test_rdb_version_9_with_stream(self):
152 r = load_rdb('redis_50_with_streams.rdb')
153--
1542.48.1
155