diff --git a/run_unitary_tests.sh b/run_unitary_tests.sh index 766d9029232b8fb5db94cfb2a5507fb8270d4494..6800facfcbfc0c2ef06a7de6803a55a43d967ef5 100755 --- a/run_unitary_tests.sh +++ b/run_unitary_tests.sh @@ -3,12 +3,16 @@ cd $(dirname $0)/src RCFILE=~/teraflow/controller/coverage/.coveragerc +## Run unitary tests and analyze coverage of code at same time +#coverage run --rcfile=$RCFILE -m pytest --log-level=DEBUG --verbose \ +# common/database/tests/test_unitary.py \ +# common/database/tests/test_engine_inmemory.py \ +# context/tests/test_unitary.py \ +# device/tests/test_unitary.py \ +# service/tests/test_unitary.py + # Run unitary tests and analyze coverage of code at same time coverage run --rcfile=$RCFILE -m pytest --log-level=DEBUG --verbose \ - common/database/tests/test_unitary.py \ - common/database/tests/test_engine_inmemory.py \ - context/tests/test_unitary.py \ - device/tests/test_unitary.py \ service/tests/test_unitary.py ## Run integration tests and analyze coverage of code at same time diff --git a/src/integration_tester/.gitlab-ci.yml b/src/integration_tester/.gitlab-ci.yml index d090e73a20e3eea4c0fb19cac579fd3aa251f79e..045b235d3aea7a7e56deedc3e60bf0dcab4dca13 100644 --- a/src/integration_tester/.gitlab-ci.yml +++ b/src/integration_tester/.gitlab-ci.yml @@ -15,6 +15,7 @@ build integration_tester: - src/common/** - src/context/** - src/device/** + - src/service/** - src/$IMAGE_NAME/** - .gitlab-ci.yml @@ -35,6 +36,7 @@ test integration_tester: - src/common/** - src/context/** - src/device/** + - src/service/** - src/$IMAGE_NAME/** - .gitlab-ci.yml @@ -49,6 +51,7 @@ integration_test integration_tester: - test integration_tester - deploy context - deploy device + - deploy service - dependencies all before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY diff --git a/src/service/tests/test_unitary.py b/src/service/tests/test_unitary.py index 700cce2cf3a2c4aa3bef3bd065982b991ad0765a..57d6d0351fb2d82758dc63517ab189c8f90f4b12 100644 --- a/src/service/tests/test_unitary.py +++ b/src/service/tests/test_unitary.py @@ -58,6 +58,7 @@ SERVICE = { @pytest.fixture(scope='session') def database(): _database = get_database(engine=DatabaseEngineEnum.INMEMORY) + populate_example(_database, add_services=False) return _database @pytest.fixture(scope='session') @@ -74,9 +75,8 @@ def service_client(service_service): yield _client _client.close() -def test_get_services_empty(service_client : ServiceClient, database : Database): +def test_get_services_empty(service_client : ServiceClient): # should work - populate_example(database, add_services=False) validate_service_list_is_empty(MessageToDict( service_client.GetServiceList(Empty()), including_default_value_fields=True, preserving_proto_field_name=True, @@ -317,9 +317,8 @@ def test_delete_service(service_client : ServiceClient): including_default_value_fields=True, preserving_proto_field_name=True, use_integers_for_enums=False)) -def test_get_services_empty_2(service_client : ServiceClient, database : Database): +def test_get_services_empty_2(service_client : ServiceClient): # should work - populate_example(database, add_services=False) validate_service_list_is_empty(MessageToDict( service_client.GetServiceList(Empty()), including_default_value_fields=True, preserving_proto_field_name=True, @@ -335,7 +334,7 @@ def test_create_service_empty_endpoints(service_client : ServiceClient): including_default_value_fields=True, preserving_proto_field_name=True, use_integers_for_enums=False)) -def test_get_services_full(service_client : ServiceClient, database : Database): +def test_get_services_full(service_client : ServiceClient): # should work validate_service_list_is_not_empty(MessageToDict( service_client.GetServiceList(Empty()),