From f4e6ea6d37148a1926ea8f28e53462cd2e13751e Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Thu, 6 Feb 2025 08:56:06 +0000 Subject: [PATCH] NBI component: - Reorganized test bash and python scripts - Updated CI/CD unit test --- .../run_tests_locally-nbi-core.sh | 12 +++++++++--- src/nbi/.gitlab-ci.yml | 2 +- src/nbi/tests/{test__nbi_core.py => test_core.py} | 0 3 files changed, 10 insertions(+), 4 deletions(-) rename src/nbi/run_test.sh => scripts/run_tests_locally-nbi-core.sh (65%) rename src/nbi/tests/{test__nbi_core.py => test_core.py} (100%) diff --git a/src/nbi/run_test.sh b/scripts/run_tests_locally-nbi-core.sh similarity index 65% rename from src/nbi/run_test.sh rename to scripts/run_tests_locally-nbi-core.sh index 07beb9837..e6eb06a62 100755 --- a/src/nbi/run_test.sh +++ b/scripts/run_tests_locally-nbi-core.sh @@ -13,7 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -export FLASK_ENV=development -# Add live logs with: -o log_cli=true -python -m pytest --log-level=DEBUG --verbose nbi/tests/test_nbi.py +PROJECTDIR=`pwd` + +cd $PROJECTDIR/src +RCFILE=$PROJECTDIR/coverage/.coveragerc + +# Run unitary tests and analyze coverage of code at same time +# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0 +coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ + nbi/tests/test_core.py diff --git a/src/nbi/.gitlab-ci.yml b/src/nbi/.gitlab-ci.yml index 163835f75..10e695d11 100644 --- a/src/nbi/.gitlab-ci.yml +++ b/src/nbi/.gitlab-ci.yml @@ -72,7 +72,7 @@ unit_test nbi: - sleep 5 - docker ps -a - docker logs $IMAGE_NAME - - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test__nbi_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_nbi_core.xml" + - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_core.py --junitxml=/opt/results/${IMAGE_NAME}_report_core.xml" - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_tfs_api.py --junitxml=/opt/results/${IMAGE_NAME}_report_tfs_api.xml" - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_ietf_l2vpn.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_l2vpn.xml" - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=DEBUG -o log_cli=true --verbose $IMAGE_NAME/tests/test_ietf_network.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_network.xml" diff --git a/src/nbi/tests/test__nbi_core.py b/src/nbi/tests/test_core.py similarity index 100% rename from src/nbi/tests/test__nbi_core.py rename to src/nbi/tests/test_core.py -- GitLab