From b8eb887b8171256c8ce0edac408dc3bfabeef89c Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Fri, 20 Nov 2015 11:25:03 +0530 Subject: [PATCH] Fix func test incorrect test result Running `tox -e functest` when swift services are not running is incorrectly reported as success! The fix for this borrowed from here: https://review.openstack.org/235933 Also, sphinx package is not needed in swiftonfile as we do not have docs to build. Change-Id: I675a438367497bc9a3c4aca21a0e48458673ab04 Signed-off-by: Prashanth Pai --- test-requirements.txt | 3 --- tox.ini | 6 ------ 2 files changed, 9 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 8c617ba..27953e7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,9 +7,6 @@ hacking>=0.8.0,<0.9 coverage nose nosexcover -openstack.nose_plugin nosehtmloutput -oslosphinx -sphinx>=1.1.2,<1.2 mock>=1.0 python-swiftclient diff --git a/tox.ini b/tox.ini index 59bf0de..763b3b0 100644 --- a/tox.ini +++ b/tox.ini @@ -8,12 +8,6 @@ usedevelop = True install_command = pip install --allow-external netifaces --allow-insecure netifaces -U {opts} {packages} whitelist_externals=bash setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 - NOSE_OPENSTACK_STDOUT=1 NOSE_WITH_COVERAGE=1 NOSE_COVER_BRANCHES=1 NOSE_COVER_PACKAGE=swiftonfile