Fix behavior when applying multiple patches sequentially

Author: razvan

src/beku/kuttl.py

@@ -228,10 +228,10 @@ def patch_dimensions(self, test_name: str, dims: List[TestDimension]) -> List[Te
 
         if self._may_patch(test_name):
             logging.debug(f"Patching test [{test_name}]")
-            result = {}
+            result = {d.name: d for d in dims}
             for _pd in self.patches:
-                for dim in _pd.patch_dimensions(test_name, dims):
-                    result[dim.name] = dim
+                result = {d.name: d for d in _pd.patch_dimensions(
+                    test_name, list(result.values()))}
             return list(result.values())
         return dims
 

src/beku/test/test_render_from_stream.py

@@ -106,8 +106,9 @@ def test_patch_the_same_dimension_twice(self):
         ets = renderer_from_stream(fixture)
         expected = EffectiveTestSuite(name='two-patches-on-the-same-test',
                                       test_cases=[TestCase(name='smoke',
-                                                           values={'druid': '26.0.0-stackable0.0.0-dev'})])
-        self.assertEqual(expected, ets[0], "Last patch wins")
+                                                           values={'druid': '24.0.0-stackable0.0.0-dev'})])
+        self.assertEqual(
+            expected, ets[0], "Take first and then take last out of that.")
 
     def test_patch_the_same_test_twice(self):
         fixture = textwrap.dedent("""
@@ -266,12 +267,16 @@ def test_multiple_patches(self):
               - name: openshift
                 values:
                   - "false"
+              - name: tls
+                values:
+                  - "false"
             tests:
               - name: smoke
                 dimensions:
                   - druid
                   - zookeeper
                   - openshift
+                  - tls
             suites:
               - name: openshift
                 patch:
@@ -280,13 +285,16 @@ def test_multiple_patches(self):
                   -  dimensions:
                       - name: openshift
                         expr: "true"
+                      - name: tls
+                        expr: "true"
             """)
         ets = renderer_from_stream(fixture)
         expected = EffectiveTestSuite(name='openshift',
                                       test_cases=[TestCase(name='smoke',
                                                            values={'druid': '26.0.0-stackable0.0.0-dev',
                                                                    'openshift': 'true',
-                                                                   'zookeeper': '3.8.0-stackable0.0.0-dev'})])
+                                                                   'zookeeper': '3.8.0-stackable0.0.0-dev',
+                                                                   'tls': 'true'})])
 
         self.assertEqual(expected, ets[0])