Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ RUN curl -sSL https://install.python-poetry.org | python3 - && \
# Install Docker
RUN curl -sSL https://get.docker.com/ | sh

# Install nodejs, npm and spell checker
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y nodejs
RUN npm install -g npm@latest
RUN npm install -g cspell@latest

# Allow installing dev dependencies to run tests
# Copy poetry dependecy files and install dependencies
# We copy install dependencies before copying all app source to reuse the dependency install step in docker.
Expand Down
5 changes: 0 additions & 5 deletions app/api/api_v1/endpoints/test_run_executions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
# limitations under the License.
#
import json
import os
from datetime import datetime
from http import HTTPStatus
from typing import Any

import requests
from fastapi import APIRouter, BackgroundTasks, Depends, File, HTTPException, UploadFile
from fastapi.encoders import jsonable_encoder
from fastapi.responses import JSONResponse, StreamingResponse
Expand All @@ -45,7 +42,6 @@
)
from app.version import version_information
from test_collections.matter.sdk_tests.support.chip.chip_server import ChipServer
from test_collections.matter.test_environment_config import TestEnvironmentConfigMatter

router = APIRouter()

Expand Down Expand Up @@ -652,4 +648,3 @@ def import_test_run_execution(
status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
detail=str(error),
)

1 change: 1 addition & 0 deletions app/pics_applicable_test_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
TestCollectionDeclaration,
)
from app.test_engine.test_script_manager import test_script_manager

PICS_PLAT_CERT = "PLAT.CERT"
PICS_PLAT_CERT_DERIVED = "PLAT.CERT.TESTS.DONE"

Expand Down
24 changes: 11 additions & 13 deletions app/test_engine/test_script_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ def ___pending_test_cases_for_test_suite(
test_cases = []

test_cases = self.__pending_test_cases_for_iterations(
test_case=test_case_declaration, iterations=iterations
)
test_case=test_case_declaration, iterations=iterations
)
suite_test_cases.extend(test_cases)

return suite_test_cases
Expand Down Expand Up @@ -323,17 +323,15 @@ def __load_test_suite_test_cases(
test_suite.test_cases = []

for test_case_execution in test_case_executions:
# TODO: request correct TestCase from TestScriptManager
test_case_declaration = self.__test_case_declaration(
test_case_execution.public_id,
test_suite_declaration=test_suite_declaration,
)
TestCaseClass = test_case_declaration.class_ref
test_case = TestCaseClass(test_case_execution=test_case_execution)
self.create_pending_teststeps_execution(
db, test_case, test_case_execution
)
test_suite.test_cases.append(test_case)
# TODO: request correct TestCase from TestScriptManager
test_case_declaration = self.__test_case_declaration(
test_case_execution.public_id,
test_suite_declaration=test_suite_declaration,
)
TestCaseClass = test_case_declaration.class_ref
test_case = TestCaseClass(test_case_execution=test_case_execution)
self.create_pending_teststeps_execution(db, test_case, test_case_execution)
test_suite.test_cases.append(test_case)

def create_pending_teststeps_execution(
self,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from contextlib import redirect_stdout
from multiprocessing.managers import BaseManager

from matter.testing.commissioning import CommissionDeviceTest
from matter.testing.CommissioningPreTest import CommissionDeviceTest
from matter.testing.matter_testing import MatterTestConfig
from matter.testing.runner import (
TestStep,
Expand Down
1 change: 1 addition & 0 deletions test_collections/matter/sdk_tests/support/sdk_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
)
DOCKER_RPC_PYTHON_TESTING_PATH = "/root/python_testing/scripts/sdk/matter_testing_infrastructure/chip/testing/test_harness_client.py" # noqa


class SDKContainerNotRunning(Exception):
"""Raised when we attempt to use the docker container, but it is not running"""

Expand Down
Loading