From 0c555d2d41977025ccfa853685903587b2175c46 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Tue, 6 Dec 2016 11:02:36 -0500 Subject: test updates - fix nose coverage flags - add coverage support for files tested outside of the utils directory - exclude stdlib and virtualenv installed dependencies --- utils/.coveragerc | 4 ++++ utils/setup.cfg | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 utils/.coveragerc (limited to 'utils') diff --git a/utils/.coveragerc b/utils/.coveragerc new file mode 100644 index 000000000..0c870af42 --- /dev/null +++ b/utils/.coveragerc @@ -0,0 +1,4 @@ +[run] +omit= + */lib/python*/site-packages/* + /usr/* diff --git a/utils/setup.cfg b/utils/setup.cfg index f5f0d8aad..baeea14f0 100644 --- a/utils/setup.cfg +++ b/utils/setup.cfg @@ -7,10 +7,12 @@ universal=1 [nosetests] tests=../,../roles/openshift_master_facts/test/,test/ verbosity=2 -with_coverage=1 -cover_html=1 -cover_package=ooinstall -cover_min_percentage=70 +with-coverage=1 +cover-html=1 +cover-inclusive=1 +cover-min-percentage=70 +cover-erase=1 +detailed-errors=1 [flake8] max-line-length=120 -- cgit v1.2.3 From 888c342174d2d6b7a51e97848c35b1e406106a66 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Wed, 30 Nov 2016 11:50:49 -0500 Subject: Handle updating of scheduler config during upgrade - do not upgrade predicates if openshift_master_scheduler_predicates is defined - do not upgrade priorities if openshift_master_scheduler_priorities is defined - do not upgrade predicates/priorities unless they match known previous default configs - output WARNING to user if predictes/priorities are not updated during install --- utils/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/setup.cfg b/utils/setup.cfg index baeea14f0..18b4e3057 100644 --- a/utils/setup.cfg +++ b/utils/setup.cfg @@ -11,8 +11,8 @@ with-coverage=1 cover-html=1 cover-inclusive=1 cover-min-percentage=70 -cover-erase=1 detailed-errors=1 +cover-branches=1 [flake8] max-line-length=120 -- cgit v1.2.3