Cleanups

Author: razvan

.github/workflows/lint.yml

@@ -17,6 +17,7 @@ jobs:
     - name: Install lint dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install --editable .
         pip install '.[lint]'
     - name: Analysing the code with ruff
       run: |

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Install test dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install '.[dev]'
+        pip install --editable .
     - name: Run unit tests
       run: |
         python -m unittest discover -v -s src/

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
     rev: 'v1.4.0'
     hooks:
       - id: mypy
-        args: ['--install-types', '--non-interactive', 'src/']
+        args: ['--install-types', '--non-interactive']
         additional_dependencies:
           - "Jinja2>=3.1.2"
           - "PyYAML>=6.0"
@@ -37,7 +37,10 @@ repos:
     hooks:
       - id: unittest
         name: unittest
-        entry: python -m unittest discover
+        entry: python -m unittest discover -v -s src/
+        additional_dependencies:
+          - "Jinja2>=3.1.2"
+          - "PyYAML>=6.0"
         language: python
         'types': [python]
         pass_filenames: false

examples/README.md

@@ -4,6 +4,9 @@ This folder contains configuration examples for Beku.
 
 ## Test Suites
 
+Test suites are an optional property of the `test-definition.yaml` file. If no test suite is explicitly defined,
+a `default` test suite is generated that selects all test definitons without patching any dimensions.
+
 The folder `suites` contains an example on how to configure test suites.
 
 The file `suites/test/test-definition.yaml` shows example configurations for two test suites:

pyproject.toml

@@ -18,7 +18,6 @@ dependencies = [
 ]
 [project.optional-dependencies]
 lint = ['ruff==0.0.275', 'mypy==1.4.0']
-dev = ['pre-commit==3.0.3', 'parameterized==0.9.0']
 
 [project.scripts]
 beku = "beku.main:main"

src/beku/kuttl.py

@@ -337,11 +337,14 @@ def renderer_from_stream(stream) -> List[EffectiveTestSuite]:
         TestDefinition(t["name"], t["dimensions"]) for t in tin["tests"]
     ]
 
-    test_suites = [TestSuite(name="default", select=[], patches=[])]
+    test_suites = []
     if "suites" in tin:
         test_suites.extend([
             TestSuite.from_dict(t) for t in tin["suites"]
         ])
+    else:
+        test_suites.append(TestSuite(name="default", select=[], patches=[]))
+
     return _resolve_effective_test_suites(dimensions, test_def, test_suites)
 
 

src/test/test_reneder_from_stream.py renamed to src/test/test_render_from_stream.py

@@ -6,6 +6,24 @@
 
 class TestRenderFromStream(unittest.TestCase):
 
+    def test_default_test_suite(self):
+        fixture = textwrap.dedent("""
+            ---
+            dimensions:
+              - name: druid
+                values:
+                  - 24.0.0-stackable0.0.0-dev
+            tests:
+              - name: smoke
+                dimensions:
+                  - druid""")
+        ets = renderer_from_stream(fixture)
+        expected = EffectiveTestSuite(name='default',
+                                      test_cases=[TestCase(name='smoke',
+                                                           values={'druid': '24.0.0-stackable0.0.0-dev'})])
+        self.assertEqual(
+            expected, ets[0], "No select, patch implicitly selected tests smoke")
+
     def test_patch_implicit_select(self):
         fixture = textwrap.dedent("""
             ---
@@ -30,7 +48,7 @@ def test_patch_implicit_select(self):
                                       test_cases=[TestCase(name='smoke',
                                                            values={'druid': '24.0.0-stackable0.0.0-dev'})])
         self.assertEqual(
-            expected, ets[1], "No select, patch implicitly selected tests smoke")
+            expected, ets[0], "No select, patch implicitly selected tests smoke")
 
     def test_patch_ignores_test_that_was_not_selected(self):
         fixture = textwrap.dedent("""
@@ -59,7 +77,7 @@ def test_patch_ignores_test_that_was_not_selected(self):
 
         ets = renderer_from_stream(fixture)
 
-        self.assertEqual(["resources"], list(dict.fromkeys([tc.name for tc in ets[1].test_cases])),
+        self.assertEqual(["resources"], list(dict.fromkeys([tc.name for tc in ets[0].test_cases])),
                          "Only the [resources] test definition was selected.")
 
     def test_patch_the_same_dimension_twice(self):
@@ -89,7 +107,7 @@ def test_patch_the_same_dimension_twice(self):
         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[1], "Last patch wins")
+        self.assertEqual(expected, ets[0], "Last patch wins")
 
     def test_patch_the_same_test_twice(self):
         fixture = textwrap.dedent("""
@@ -120,7 +138,7 @@ def test_patch_the_same_test_twice(self):
         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[1], "Last patch wins")
+        self.assertEqual(expected, ets[0], "Last patch wins")
 
     def test_patch_str_expression(self):
         fixture = textwrap.dedent("""
@@ -147,7 +165,7 @@ def test_patch_str_expression(self):
         expected = EffectiveTestSuite(name='select-25.0.0',
                                       test_cases=[TestCase(name='smoke',
                                                            values={'druid': '25.0.0-stackable0.0.0-dev'})])
-        self.assertEqual(expected, ets[1], "String expression works")
+        self.assertEqual(expected, ets[0], "String expression works")
 
     def test_resolve_explicit_select(self):
         fixture = textwrap.dedent("""
@@ -188,14 +206,9 @@ def test_resolve_explicit_select(self):
                       - name: druid
                         expr: last""")
         ets = renderer_from_stream(fixture)
-        # pprint(ets[0].test_cases)
-        self.assertEqual(["default", "latest"], [
-            e.name for e in ets], "Two effective test suite resolved.")
-        self.assertEqual(7, len(ets[0].test_cases),
-                         "The [default] test suite has 7 test cases.")
-        self.assertEqual(3, len(ets[1].test_cases),
+        self.assertEqual(3, len(ets[0].test_cases),
                          "The [latest] test suite has 3 test cases.")
-        self.assertEqual(["smoke", "resources"], list(dict.fromkeys([tc.name for tc in ets[1].test_cases])),
+        self.assertEqual(["smoke", "resources"], list(dict.fromkeys([tc.name for tc in ets[0].test_cases])),
                          "Two test definitions were selected.")
 
     def test_resolve_select_all(self):
@@ -232,12 +245,7 @@ def test_resolve_select_all(self):
                   - dimensions:
                       - expr: last""")
         ets = renderer_from_stream(fixture)
-        # pprint(ets[0].test_cases)
-        self.assertEqual(["default", "latest"], [
-            e.name for e in ets], "Two effective test suite resolved.")
-        self.assertEqual(9, len(ets[0].test_cases),
-                         "The [default] test suite has 9 test cases.")
-        self.assertEqual(2, len(ets[1].test_cases),
+        self.assertEqual(2, len(ets[0].test_cases),
                          "The [latest] test suite has 2 test cases.")
         self.assertEqual(["smoke", "resources"], list(dict.fromkeys([tc.name for tc in ets[0].test_cases])),
                          "Two test definitions were selected.")