MOD-14486: Don't split space-separated moduleArgs into key-value pairs

The key-value pair splitting introduced in PR #243 changes how args are
passed to Redis loadmodule, breaking modules that expect the original
single-string format. This caused silent Redis server crashes in CI
multiprocessing workers.

Revert to pre-v0.7.22 behavior: when no semicolons are present, keep
the entire string as a single arg. The case-insensitive arg matching
from PR #243 is preserved.

Author: ofiryanai

RLTest/utils.py

@@ -108,10 +108,8 @@ def fix_modulesArgs(modules, modulesArgs, defaultArgs=None, haveSeqs=True):
     # arg string is a string of words separated by whitespace.
     # arg string can be separated by semicolons into (logical) arg lists.
     # semicolons can be escaped with a backslash.
-    # if no semicolons are present, the string is treated as space-separated key-value pairs,
-    # where each consecutive pair of words forms a 'KEY VALUE' arg.
-    # thus, 'K1 V1 K2 V2' becomes ['K1 V1', 'K2 V2']
-    # an odd number of words without semicolons is an error.
+    # if no semicolons are present, the entire string is kept as a single arg.
+    # thus, 'K1 V1 K2 V2' becomes ['K1 V1 K2 V2']
     # for args with multiple values, semicolons are required:
     # thus, 'K1 V1; K2 V2 V3' becomes ['K1 V1', 'K2 V2 V3']
     # arg list is a list of arg strings.
@@ -121,15 +119,6 @@ def fix_modulesArgs(modules, modulesArgs, defaultArgs=None, haveSeqs=True):
         # case # 'args ...': arg string for a single module
         # transformed into [['arg', ...]]
         parts = split_by_semicolon(modulesArgs)
-        if len(parts) == 1:
-            # No semicolons found - treat as space-separated key-value pairs
-            words = parts[0].split()
-            if len(words) % 2 != 0:
-                print(Colors.Bred(f"Error in args: odd number of words in key-value pairs: '{modulesArgs}'. "
-                                  f"Use semicolons to separate args with multiple values (e.g. 'KEY1 V1; KEY2 V2 V3')."))
-                sys.exit(1)
-            if len(words) > 2:
-                parts = [f"{words[i]} {words[i + 1]}" for i in range(0, len(words), 2)]
         modulesArgs = [parts]
     elif type(modulesArgs) == list:
         args = []

tests/unit/test_utils.py

@@ -10,33 +10,35 @@ def test_single_key_value_pair(self):
         result = fix_modulesArgs(['/mod.so'], 'WORKERS 4')
         self.assertEqual(result, [['WORKERS 4']])
 
-    # 2. Multiple key-value pairs without semicolons (new behavior)
+    # 2. Multiple key-value pairs without semicolons - kept as single string
     def test_multiple_kv_pairs_no_semicolons(self):
         result = fix_modulesArgs(['/mod.so'], '_FREE_RESOURCE_ON_THREAD FALSE TIMEOUT 80 WORKERS 4')
-        self.assertEqual(result, [['_FREE_RESOURCE_ON_THREAD FALSE', 'TIMEOUT 80', 'WORKERS 4']])
+        self.assertEqual(result, [['_FREE_RESOURCE_ON_THREAD FALSE TIMEOUT 80 WORKERS 4']])
 
     # 3. Semicolon-separated args (existing behavior)
     def test_semicolon_separated_args(self):
         result = fix_modulesArgs(['/mod.so'], 'KEY1 V1; KEY2 V2')
         self.assertEqual(result, [['KEY1 V1', 'KEY2 V2']])
 
-    # 4a. Odd number of words without semicolons - should error
-    def test_odd_words_no_semicolons_exits(self):
-        with self.assertRaises(SystemExit):
-            fix_modulesArgs(['/mod.so'], 'FLAG TIMEOUT 80')
+    # 4a. Odd number of words without semicolons - kept as single string (no error)
+    def test_odd_words_no_semicolons_kept_as_single(self):
+        result = fix_modulesArgs(['/mod.so'], 'FLAG TIMEOUT 80')
+        self.assertEqual(result, [['FLAG TIMEOUT 80']])
 
     # 4b. Odd number of words with semicolons - valid, semicolons split first
     def test_odd_words_with_semicolons_valid(self):
         result = fix_modulesArgs(['/mod.so'], 'FLAG; TIMEOUT 80')
         self.assertEqual(result, [['FLAG', 'TIMEOUT 80']])
 
-    # 5a. Space-separated string overrides matching defaults, non-matching defaults added
+    # 5a. Space-separated string kept as single arg, non-matching defaults added
     def test_space_separated_overrides_defaults(self):
         defaults = [['WORKERS 8', 'TIMEOUT 60', 'EXTRA 1']]
         result = fix_modulesArgs(['/mod.so'], 'WORKERS 4 TIMEOUT 80', defaults)
+        # Without semicolons, the string is kept as one arg (first word = WORKERS).
+        # Only 'WORKERS 8' default is overridden; 'TIMEOUT 60' and 'EXTRA 1' remain.
         result_dict = {arg.split(' ')[0]: arg for arg in result[0]}
-        self.assertEqual(result_dict['WORKERS'], 'WORKERS 4')
-        self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 80')
+        self.assertEqual(result_dict['WORKERS'], 'WORKERS 4 TIMEOUT 80')
+        self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 60')
         self.assertEqual(result_dict['EXTRA'], 'EXTRA 1')
 
     # 5b. Semicolon-separated string overrides matching defaults
@@ -48,13 +50,14 @@ def test_semicolon_separated_overrides_defaults(self):
         self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 80')
         self.assertEqual(result_dict['EXTRA'], 'EXTRA 1')
 
-    # 5c. Space-separated explicit overrides some defaults, non-overlapping defaults are merged
+    # 5c. Space-separated explicit kept as single arg, non-overlapping defaults are merged
     def test_space_separated_partial_override_with_defaults(self):
         defaults = [['_FREE_RESOURCE_ON_THREAD TRUE', 'TIMEOUT 100', 'WORKERS 8']]
         result = fix_modulesArgs(['/mod.so'], 'WORKERS 4 TIMEOUT 80', defaults)
+        # Single arg 'WORKERS 4 TIMEOUT 80' overrides 'WORKERS 8' default only
         result_dict = {arg.split(' ')[0]: arg for arg in result[0]}
-        self.assertEqual(result_dict['WORKERS'], 'WORKERS 4')
-        self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 80')
+        self.assertEqual(result_dict['WORKERS'], 'WORKERS 4 TIMEOUT 80')
+        self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 100')
         self.assertEqual(result_dict['_FREE_RESOURCE_ON_THREAD'], '_FREE_RESOURCE_ON_THREAD TRUE')
 
     # 6. None input with defaults - deep copy of defaults
@@ -93,11 +96,11 @@ def test_multi_module_with_defaults(self):
         self.assertEqual(dict2['K4'], 'K4 d4')
 
 
-    # 9. Case-insensitive matching between explicit args and defaults (both directions)
+    # 9. Case-insensitive matching between explicit args and defaults (semicolons)
     def test_case_insensitive_override(self):
-        # Uppercase explicit overrides lowercase defaults
+        # Uppercase explicit overrides lowercase defaults (using semicolons for multiple args)
         defaults = [['workers 8', 'timeout 60', 'EXTRA 1', 'MIxEd 7', 'lower true']]
-        result = fix_modulesArgs(['/mod.so'], 'WORKERS 4 TIMEOUT 80 miXed 0 LOWER false', defaults)
+        result = fix_modulesArgs(['/mod.so'], 'WORKERS 4; TIMEOUT 80; miXed 0; LOWER false', defaults)
         result_dict = {arg.split(' ')[0]: arg for arg in result[0]}
         self.assertEqual(result_dict['WORKERS'], 'WORKERS 4')
         self.assertEqual(result_dict['TIMEOUT'], 'TIMEOUT 80')
@@ -108,3 +111,11 @@ def test_case_insensitive_override(self):
         self.assertNotIn('timeout', result_dict)
         self.assertNotIn('MIxEd', result_dict)
         self.assertNotIn('lower', result_dict)
+
+    # 10. Regression test: space-separated moduleArgs without semicolons should NOT
+    # be split into key-value pairs. They should be kept as a single arg string,
+    # matching the pre-v0.7.22 behavior.
+    def test_space_separated_args_not_split_into_pairs(self):
+        result = fix_modulesArgs(['module.so'], 'DEFAULT_DIALECT 2 WORKERS 4 _FREE_RESOURCE_ON_THREAD FALSE')
+        # Should be kept as ONE arg string, not split into pairs
+        self.assertEqual(result, [['DEFAULT_DIALECT 2 WORKERS 4 _FREE_RESOURCE_ON_THREAD FALSE']])