Enable github workflows for main branch

.devcontainer/docker-compose.yml

@@ -59,7 +59,7 @@ services:
     volumes:
       - app-db-data:/var/lib/postgresql/data/pgdata
     env_file:
-      - .env
+      - ../.env
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
     deploy:
@@ -74,7 +74,7 @@ services:
     depends_on:
       - db
     env_file:
-      - .env
+      - ../.env
     environment:
       - SERVER_NAME=${DOMAIN?Variable not set}
       - SERVER_HOST=https://${DOMAIN?Variable not set}

.github/workflows/python-lint.yml

@@ -1,13 +1,12 @@
 name: Python Linting
 
 on:
-  pull_request:
-    branches:
-      - develop
-      - "release/**"
+  pull_request_target:
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - develop
+      - main
       - "release/**"
 
 jobs:
@@ -40,9 +39,8 @@ jobs:
           types-pyyaml==6.0.12.10
           types-retry==0.9.9.4
       - name: Run linters
-        uses: wearerequired/lint-action@v1
+        uses: wearerequired/lint-action@v2
         with:
-          github_token: ${{ secrets.github_token }}
           # Enable linters
           black: true
           flake8: true

.github/workflows/spell-check.yml

@@ -1,11 +1,11 @@
 name: "Check spelling"
 on: # rebuild any PRs and main branch changes
-  pull_request:
-    branches:
-      - develop
+  pull_request_target:
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - develop
+      - main
 jobs:
   spellcheck: # run the action
     runs-on: ubuntu-latest

.github/workflows/unittests.yml

@@ -1,12 +1,12 @@
 name: Unit Tests
 
 on:
-  pull_request:
-    branches:
-      - develop
+  pull_request_target:
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - develop
+      - main
 
 jobs:
   backend-tests:
@@ -39,15 +39,15 @@ jobs:
       - name: Load .env file to job environent
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: '.env'    
-      
+          envFile: ".env"
+
       - name: Install poetry
         run: pipx install poetry
-      
+
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.10"
           cache: poetry
           cache-dependency-path: poetry.lock
       - name: Set Poetry environment
@@ -63,7 +63,7 @@ jobs:
       - name: Fetch yaml tests and runner
         run: |
           source $(poetry env info --path)/bin/activate
-          ./scripts/fetch_sdk_yaml_tests_and_runner.sh
+          ./test_collections/sdk_tests/fetch_sdk_tests_and_runner.sh
         env:
           SERVER_NAME: localhost
           SERVER_HOST: http://localhost
@@ -76,4 +76,4 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: postgres
           SERVER_NAME: localhost
-          SERVER_HOST: http://localhost
+          SERVER_HOST: http://localhost

app/chip_tool/chip_tool.py

@@ -99,7 +99,9 @@
 
 # Websocket runner
 BACKEND_ROOT = Path(__file__).parents[2]
-TEST_COLLECTION_SDK_CHECKOUT_PATH = BACKEND_ROOT / Path("test_collections/sdk_tests/sdk_checkout/")
+TEST_COLLECTION_SDK_CHECKOUT_PATH = BACKEND_ROOT / Path(
+    "test_collections/sdk_tests/sdk_checkout/"
+)
 YAML_TESTS_PATH_BASE = TEST_COLLECTION_SDK_CHECKOUT_PATH / Path("yaml_tests/")
 YAML_TESTS_PATH = YAML_TESTS_PATH_BASE / Path("yaml/sdk")
 XML_SPEC_DEFINITION_PATH = TEST_COLLECTION_SDK_CHECKOUT_PATH / Path(

app/test_engine/models/manual_test_case.py

@@ -156,8 +156,11 @@ def handle_uploaded_file(self, file: UploadFile) -> None:
                 try:
                     logger.info(line.decode("utf-8").strip())
                 except UnicodeDecodeError:
-                    logger.warning("WARNING: The following line contained invalid UTF-8. Some content was replaced with: �")
-                    logger.info(line.decode("utf-8", errors='replace').strip())
+                    logger.warning(
+                        "WARNING: The following line contained invalid UTF-8."
+                        " Some content was replaced with: �"
+                    )
+                    logger.info(line.decode("utf-8", errors="replace").strip())
         logger.info("---- End of Manual Log ----")
 
 

app/tests/yaml_tests/test_sdk_yaml_collection.py

@@ -34,6 +34,7 @@
 VERSION_FILE_FILENAME = ".version"
 VERSION_FILE_PATH = Path("/app/backend/test_collections/sdk_tests/sdk_checkout/")
 
+
 @pytest.fixture
 def yaml_collection() -> YamlCollectionDeclaration:
     test_sdk_yaml_path = Path(__file__).parent / "test_yamls"

app/tests/yaml_tests/test_test_declarations.py

@@ -31,7 +31,8 @@ def test_yaml_suite_declaration() -> None:
     version = "SomeVersionStr"
 
     with mock.patch(
-        "test_collections.sdk_tests.support.yaml_tests.models.test_suite.YamlTestSuite.class_factory"
+        "test_collections.sdk_tests.support.yaml_tests.models."
+        "test_suite.YamlTestSuite.class_factory"
     ) as class_factory, mock.patch(
         "app.test_engine.models.test_declarations.TestSuiteDeclaration.__init__"
     ) as declaration_init:
@@ -46,7 +47,8 @@ def test_yaml_case_declaration() -> None:
     test = YamlTest(name="TestTest", config={}, tests=[])
     version = "SomeVersionStr"
     with mock.patch(
-        "test_collections.sdk_tests.support.yaml_tests.models.test_case.YamlTestCase.class_factory"
+        "test_collections.sdk_tests.support.yaml_tests.models."
+        "test_case.YamlTestCase.class_factory"
     ) as class_factory, mock.patch(
         "app.test_engine.models.test_declarations.TestCaseDeclaration.__init__"
     ) as declaration_init:

app/tests/yaml_tests/test_test_suite.py

@@ -127,9 +127,11 @@ async def test_manual_suite_setup_cleanup() -> None:
     with mock.patch.object(
         target=test_engine_logger, attribute="info"
     ) as logger_info, mock.patch(
-        "test_collections.sdk_tests.support.yaml_tests.models.test_suite.YamlTestSuite.setup"
+        "test_collections.sdk_tests.support.yaml_tests.models."
+        "test_suite.YamlTestSuite.setup"
     ) as _, mock.patch(
-        "test_collections.sdk_tests.support.yaml_tests.models.test_suite.YamlTestSuite.cleanup"
+        "test_collections.sdk_tests.support.yaml_tests.models."
+        "test_suite.YamlTestSuite.cleanup"
     ) as _:
         await suite_instance.setup()
         logger_info.assert_called_once()
@@ -154,7 +156,8 @@ async def test_chip_tool_suite_setup() -> None:
         suite_instance = suite_class(TestSuiteExecution())
 
         with mock.patch(
-            "test_collections.sdk_tests.support.yaml_tests.models.test_suite.YamlTestSuite.setup"
+            "test_collections.sdk_tests.support.yaml_tests.models."
+            "test_suite.YamlTestSuite.setup"
         ) as yaml_suite_setup, mock.patch(
             "app.chip_tool.test_suite.ChipToolSuite.setup"
         ) as chip_tool_suite_setup:

app/tests/yaml_tests/test_yaml_folder.py

@@ -31,19 +31,15 @@ def test_yaml_folder_version() -> None:
     with mock.patch(
         "test_collections.sdk_tests.support.yaml_tests.models.yaml_test_folder.open",
         new=mock.mock_open(read_data=version_file_content),
-    ), mock.patch.object(
-        target=Path, attribute="exists", return_value=True
-    ) as _:
+    ), mock.patch.object(target=Path, attribute="exists", return_value=True) as _:
         yaml_folder = YamlTestFolder(test_yaml_path)
 
         assert yaml_folder.version == version_file_content
 
 
 def test_yaml_folder_version_missing() -> None:
     expected_version = "Unknown"
-    with mock.patch.object(
-        target=Path, attribute="exists", return_value=False
-    ) as _:
+    with mock.patch.object(target=Path, attribute="exists", return_value=False) as _:
         yaml_folder = YamlTestFolder(test_yaml_path)
         assert yaml_folder.version == expected_version
 

cspell.json

@@ -99,11 +99,12 @@
         "*.ini",
         "*.toml",
         "docker-compose*",
-        "*.dockerfile",
+        "Dockerfile",
         "*.pyc",
         ".vscode/*",
         "test_collections/sdk_tests/sdk_checkout",
-        "sdk_patch"
+        "sdk_patch",
+        ".devcontainer"
     ],
     "enableFiletypes": [
         "shellscript"

mypy.ini

@@ -31,7 +31,8 @@ exclude = (?x)(
     ^test_collections\/sdk_tests\/sdk_checkout\/
         (
             sdk_runner |
-            yaml_tests\/yaml\/sdk
+            yaml_tests\/yaml\/sdk |
+            python_testing
         )
     \/.*\.py$ 
   )

test_collections/sdk_tests/__init__.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .support.yaml_tests import sdk_collection, custom_collection
+from .support.yaml_tests import custom_collection, sdk_collection

test_collections/sdk_tests/support/yaml_tests/__init__.py

@@ -13,12 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from typing import Optional
+
 from app.test_engine.models.test_declarations import TestCollectionDeclaration
 
-from .sdk_yaml_tests import sdk_yaml_test_collection, custom_yaml_test_collection
+from .sdk_yaml_tests import custom_yaml_test_collection, sdk_yaml_test_collection
 
 # Test engine will auto load TestCollectionDeclarations declared inside the package
 # initializer
 sdk_collection: TestCollectionDeclaration = sdk_yaml_test_collection()
 
-custom_collection: TestCollectionDeclaration = custom_yaml_test_collection()
+custom_collection: Optional[TestCollectionDeclaration] = custom_yaml_test_collection()

test_collections/sdk_tests/support/yaml_tests/models/yaml_test_folder.py

@@ -21,6 +21,7 @@
 VERSION_FILE_FILENAME = ".version"
 
 
+
 class YamlTestFolder:
     """Representing a folder with Test YAML files.
 

test_collections/sdk_tests/support/yaml_tests/sdk_yaml_tests.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 from pathlib import Path
+from typing import Optional
 
 from loguru import logger
 
@@ -128,14 +129,14 @@ def sdk_yaml_test_collection(
 
 def custom_yaml_test_collection(
     yaml_test_folder: YamlTestFolder = CUSTOM_YAML_TEST_FOLDER,
-) -> YamlCollectionDeclaration:
+) -> Optional[YamlCollectionDeclaration]:
     """Declare a new collection of test suites."""
     collection = YamlCollectionDeclaration(
         name="Custom YAML Tests", folder=yaml_test_folder
     )
 
     files = yaml_test_folder.yaml_file_paths()
-    suites = _parse_all_yaml(yaml_files=files, yaml_version=None)
+    suites = _parse_all_yaml(yaml_files=files, yaml_version="custom")
 
     for suite in suites:
         if not suite.test_cases: