From 3b6376d6ef6d8e90ad9ef4cc33ab610c501015d2 Mon Sep 17 00:00:00 2001 From: "Lovett, Trevor" Date: Fri, 30 Aug 2019 10:07:40 -0500 Subject: [PATCH] [VVP] Ensure Sonar coverage executes all tests Today the Sonar coverage is only exercising the --self-tests which excludes the tests written for other functionality such as GUIs, helpers, and preload generation. This change will ensure all tests are executed by both verify jobs and Sonar coverage Issue-ID: VVP-251 Change-Id: I291b578aef477bfaaa9d8d061c5b8a23614d514a Signed-off-by: Lovett, Trevor --- ice_validator/app_tests/test_app.py | 51 ------------------------------------- pom.xml | 2 +- tox.ini | 3 ++- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 ice_validator/app_tests/test_app.py diff --git a/ice_validator/app_tests/test_app.py b/ice_validator/app_tests/test_app.py deleted file mode 100644 index fe99b0a..0000000 --- a/ice_validator/app_tests/test_app.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- coding: utf8 -*- -# ============LICENSE_START==================================================== -# org.onap.vvp/validation-scripts -# =================================================================== -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# =================================================================== -# -# Unless otherwise specified, all software contained herein is licensed -# under the Apache License, Version 2.0 (the "License"); -# you may not use this software except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# -# Unless otherwise specified, all documentation contained herein is licensed -# under the Creative Commons License, Attribution 4.0 Intl. (the "License"); -# you may not use this documentation except in compliance with the License. -# You may obtain a copy of the License at -# -# https://creativecommons.org/licenses/by/4.0/ -# -# Unless required by applicable law or agreed to in writing, documentation -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ============LICENSE_END============================================ -# -# - -from threading import Thread - -from vvp import ValidatorApp, VERSION - - -def test_app_starts(): - app = ValidatorApp() - assert "VNF Validation Tool" in app.title - assert VERSION in app.title - app_thread = Thread(target=app.start, args=()) - app_thread.daemon = True - app.config.command_queue.put("SHUTDOWN") diff --git a/pom.xml b/pom.xml index 398db16..8c1fab1 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ coverage.xml py python - ice_validator/tests/**.py + ice_validator/**.py diff --git a/tox.ini b/tox.ini index 8bbf1fc..261fdf0 100644 --- a/tox.ini +++ b/tox.ini @@ -42,6 +42,7 @@ skipsdist=True envlist = py36 [testenv] +DISPLAY = :0.0 whitelist_externals = install_win_deps.py passenv = @@ -53,7 +54,7 @@ commands = pip install -r requirements.txt {envpython} --version pytest --version - coverage run --module pytest ice_validator/tests --self-test -rxXs + coverage run --module pytest ice_validator --self-test -rxXs coverage xml flake8 --version flake8 ice_validator -- 2.16.6