From ffb6fbf825d0440aeedf7ee69376d78d977c26fb Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 24 Apr 2016 14:44:04 -0400 Subject: [PATCH] - don't use --dropfirst when we are using ad-hoc DBs. dropfirst is unnecessary and causes collisions against other CI runs Change-Id: I47e9bc98cd6ef4ab90be25bae45897dabae16308 --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7d5826a4bb..d5c3b670b1 100644 --- a/tox.ini +++ b/tox.ini @@ -37,10 +37,13 @@ whitelist_externals=sh # BASECOMMAND - using an env variable here so we can use it # as a substitution in a command (see https://bitbucket.org/hpk42/tox/issues/307/) # +# only use --dropfirst option if we're *not* using -n; +# if -n is used, we're working in brand new DBs anyway, dropfirst +# will collide on CI environments setenv= PYTHONPATH= PYTHONNOUSERSITE=1 - BASECOMMAND=python -m pytest --dropfirst + BASECOMMAND=python -m pytest WORKERS=-n4 oracle: WORKERS=-n2 -- 2.47.2