- don't use --dropfirst when we are using ad-hoc DBs. dropfirst

is unnecessary and causes collisions against other CI runs

Change-Id: I47e9bc98cd6ef4ab90be25bae45897dabae16308

diff --git a/tox.ini b/tox.ini
index 7d5826a4bb1e32d97fdb09fb544acaa3b6c038bb..d5c3b670b146f29bc812f1ea260ba9fb4d79f6af 100644 (file)
--- 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