From 63ebf58bf17a7391f466c94781361d6de19cba32 Mon Sep 17 00:00:00 2001 From: Carlos Natalino Date: Wed, 2 Nov 2022 14:55:45 +0100 Subject: [PATCH 1/2] Improving the scripts that launch all tests at once. --- src/tests/ecoc22/run_tests_and_coverage.sh | 11 ++++++----- src/tests/ofc22/run_tests_and_coverage.sh | 16 ++++++++-------- .../ofc22/tests/test_functional_bootstrap.py | 1 - 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/tests/ecoc22/run_tests_and_coverage.sh b/src/tests/ecoc22/run_tests_and_coverage.sh index 835867896..4517cc1ea 100755 --- a/src/tests/ecoc22/run_tests_and_coverage.sh +++ b/src/tests/ecoc22/run_tests_and_coverage.sh @@ -16,7 +16,6 @@ PROJECTDIR=`pwd` -cd $PROJECTDIR/src RCFILE=$PROJECTDIR/coverage/.coveragerc COVERAGEFILE=$PROJECTDIR/coverage/.coverage @@ -26,18 +25,20 @@ cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PRO # Destroy old coverage file rm -f $COVERAGEFILE +source tfs_runtime_env_vars.sh + # Force a flush of Context database kubectl --namespace $TFS_K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL # Run functional tests and analyze code coverage at the same time coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ecoc22/tests/test_functional_bootstrap.py + src/tests/ecoc22/tests/test_functional_bootstrap.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ecoc22/tests/test_functional_create_service.py + src/tests/ecoc22/tests/test_functional_create_service.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ecoc22/tests/test_functional_delete_service.py + src/tests/ecoc22/tests/test_functional_delete_service.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ecoc22/tests/test_functional_cleanup.py + src/tests/ecoc22/tests/test_functional_cleanup.py diff --git a/src/tests/ofc22/run_tests_and_coverage.sh b/src/tests/ofc22/run_tests_and_coverage.sh index bafc920c7..ae956925a 100755 --- a/src/tests/ofc22/run_tests_and_coverage.sh +++ b/src/tests/ofc22/run_tests_and_coverage.sh @@ -16,30 +16,30 @@ PROJECTDIR=`pwd` -cd $PROJECTDIR/src +# cd $PROJECTDIR/src RCFILE=$PROJECTDIR/coverage/.coveragerc COVERAGEFILE=$PROJECTDIR/coverage/.coverage # Configure the correct folder on the .coveragerc file -cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE +cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR/src+g > $RCFILE # Destroy old coverage file rm -f $COVERAGEFILE +source tfs_runtime_env_vars.sh + # Force a flush of Context database kubectl --namespace $TFS_K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL -source tfs_runtime_env_vars.sh - # Run functional tests and analyze code coverage at the same time coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ofc22/tests/test_functional_bootstrap.py + src/tests/ofc22/tests/test_functional_bootstrap.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ofc22/tests/test_functional_create_service.py + src/tests/ofc22/tests/test_functional_create_service.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ofc22/tests/test_functional_delete_service.py + src/tests/ofc22/tests/test_functional_delete_service.py coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ - tests/ofc22/tests/test_functional_cleanup.py + src/tests/ofc22/tests/test_functional_cleanup.py diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py index 76c52810b..8b362b8c3 100644 --- a/src/tests/ofc22/tests/test_functional_bootstrap.py +++ b/src/tests/ofc22/tests/test_functional_bootstrap.py @@ -198,7 +198,6 @@ def test_scenario_kpis_created(monitoring_client: MonitoringClient): during the service creation process. """ response: KpiDescriptorList = monitoring_client.GetKpiDescriptorList(Empty()) - LOGGER.info("Number of KPIs created: {}".format(len(response.kpi_descriptor_list))) # TODO: replace the magic number `16` below for a formula that adapts to the number # of links and devices assert len(response.kpi_descriptor_list) == 16 -- GitLab From 5bb7de37c4031b262a9c9494ee5388a29ac09cbd Mon Sep 17 00:00:00 2001 From: Carlos Natalino Date: Tue, 22 Nov 2022 18:07:34 +0100 Subject: [PATCH 2/2] Modifying the number of KPIs necessary so that the tests are more suitable for being run after other tests. --- src/tests/ofc22/tests/test_functional_bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py index 8b362b8c3..65b7cece1 100644 --- a/src/tests/ofc22/tests/test_functional_bootstrap.py +++ b/src/tests/ofc22/tests/test_functional_bootstrap.py @@ -200,4 +200,4 @@ def test_scenario_kpis_created(monitoring_client: MonitoringClient): response: KpiDescriptorList = monitoring_client.GetKpiDescriptorList(Empty()) # TODO: replace the magic number `16` below for a formula that adapts to the number # of links and devices - assert len(response.kpi_descriptor_list) == 16 + assert len(response.kpi_descriptor_list) >= 16 -- GitLab