From ea4750a366123f78411d90082733642376dc6afc Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Mon, 2 Nov 2015 11:55:17 +0530 Subject: Rebase to stable/kilo This change ports most of swiftonfile object server fixes and changes into gluster-swift. Storage policy as a feature is not usable here (it doesn't make sense). The hacky way of creating zero byte tracker objects for object expiration has not been ported to this release due to scalability issues and the need to have a separate volume. Change-Id: I17ba27dacea9ac000bdb8934700996e4d17f4251 Signed-off-by: Prashanth Pai Reviewed-on: http://review.gluster.org/13269 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- tox.ini | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 1942c26..64eb645 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pep8,functest,ksfunctest +envlist = py26,py27,pep8,functest minversion = 1.6 skipsdist = True @@ -8,26 +8,21 @@ 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=gluster deps = - git+https://github.com/openstack/swift.git@icehouse-eol + git+https://github.com/openstack/swift.git@stable/kilo -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt # Just having testtools package installed fixes some dependency issue # https://github.com/swiftstack/vagrant-swift-all-in-one/issues/19 # pip needs a good dependency resolver :/ - testtools - flake8 +# testtools +# flake8 changedir = {toxinidir}/test/unit commands = nosetests -v {posargs} +passenv = SWIFT_* *_proxy [testenv:cover] setenv = VIRTUAL_ENV={envdir} @@ -61,7 +56,14 @@ changedir = {toxinidir} commands = bash tools/tox_run.sh [flake8] +# it's not a bug that we aren't using all of hacking +# H102 -> apache2 license exists +# H103 -> license is apache +# H201 -> no bare excepts (unless marked with " # noqa") +# H231 -> Check for except statements to be Python 3.x compatible +# H501 -> don't use locals() for str formatting +# H903 -> \n not \r\n ignore = H -builtins = _ -exclude = .venv,.tox,dist,doc,test,*egg +select = F,E,W,H102,H103,H201,H231,H501,H903 +exclude = .venv,.tox,dist,doc,*egg,test show-source = True -- cgit