From f048068216c655b6babc5740fc4b5e7efcf02ab1 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 16 Jul 2021 12:14:34 +0100
Subject: [PATCH] tox: Simplify test running

We were actually running tests four times. Twice with eventlet disabled
and twice with it enabled. Correct this.

Change-Id: Idb3926d73ff3c11abe9c273062aca1b299b9f72e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 tools/run-pifpaf-tests.sh | 4 ++--
 tox.ini                   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/run-pifpaf-tests.sh b/tools/run-pifpaf-tests.sh
index ee21c699..072975cb 100755
--- a/tools/run-pifpaf-tests.sh
+++ b/tools/run-pifpaf-tests.sh
@@ -3,5 +3,5 @@ set -e
 # Replace mysql:// by mysql+pymysql:// and add sqlite
 export OS_TEST_DBAPI_ADMIN_CONNECTION="${OS_TEST_DBAPI_ADMIN_CONNECTION/#mysql:/mysql+pymysql:};sqlite://"
 echo $OS_TEST_DBAPI_ADMIN_CONNECTION
-stestr run $*
-TEST_EVENTLET=1 stestr run $*
+TEST_EVENTLET=0 stestr run $*
+TEST_EVENTLET=1 stestr run --combine $*
diff --git a/tox.ini b/tox.ini
index 3cf52ad3..254f6932 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,7 @@ deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands =
-  env TEST_EVENTLET=0 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
-  env TEST_EVENTLET=1 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
+  {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
 
 [testenv:pep8]
 commands =