Upgrade redis to 7.4.9

build_scripts/update_redis_server.py

@@ -8,7 +8,7 @@
 import tempfile
 
 
-redis_version = os.environ.get('REDIS_VERSION', '6.2.14')
+redis_version = os.environ.get('REDIS_VERSION', '7.4.9')
 url = f'http://download.redis.io/releases/redis-{redis_version}.tar.gz'
 
 

screwdriver.yaml

@@ -3,7 +3,7 @@ shared:
   environment:
     CHANGELOG_FILENAME: docs/source/topic/changelog.md
     PACKAGE_DIRECTORY: redislite
-    REDIS_VERSION: '6.2.14'
+    REDIS_VERSION: '7.4.9'
     TOX_ENVLIST: py38,py39,py310,py311
   steps:
     - postinit_os: build_scripts/update_redis_server.py

setup.cfg

@@ -35,7 +35,7 @@ project_urls =
     Documentation = https://redislite.readthedocs.io/en/latest/
     Source = https://github.com/yahoo/redislite
 url = https://github.com/yahoo/redislite
-version = 6.2.14
+version = 7.4.9
 
 [options]
 install_requires=

setup.py

@@ -29,7 +29,7 @@
 BASEPATH = os.path.dirname(os.path.abspath(__file__))
 REDIS_PATH = os.path.join(BASEPATH, 'redis.submodule')
 REDIS_SERVER_METADATA = {}
-REDIS_VERSION = os.environ.get('REDIS_VERSION', '6.2.14')
+REDIS_VERSION = os.environ.get('REDIS_VERSION', '7.4.9')
 REDIS_URL = f'http://download.redis.io/releases/redis-{REDIS_VERSION}.tar.gz'
 install_scripts = ''
 try:

tests/test_client.py

@@ -313,7 +313,7 @@ def test_shutdown_race_condition(self):
 
     def test_redis_log_attribute(self):
         r = redislite.StrictRedis()
-        self.assertIn('The server is now ready to accept connections', r.redis_log)
+        self.assertIn('Ready to accept connections', r.redis_log)
 
     def test_redis_log_tail(self):
         r = redislite.StrictRedis()

tests/test_slave.py

@@ -17,9 +17,18 @@
 class TestRedisliteSlave(unittest.TestCase):
 
     def test_slave(self):
-        master = redislite.Redis(serverconfig={'port': '7000'})
+        master = redislite.Redis(
+            serverconfig={'port': '7000', 'repl-diskless-sync-delay': '0'}
+        )
         slave = redislite.Redis(serverconfig={'slaveof': 'localhost 7000'})
         master.set('key', 'value')
-        time.sleep(.5)
-        value = slave.get('key').decode(encoding='UTF-8')
-        self.assertEquals(value, 'value')
+
+        # Redis 7.x defaults to diskless replication, so wait for the sync rather than a fixed delay.
+        value = None
+        for _ in range(100):
+            raw = slave.get('key')
+            if raw is not None:
+                value = raw.decode(encoding='UTF-8')
+                break
+            time.sleep(0.1)
+        self.assertEqual(value, 'value')