From 2d7151e14b4369e1bace64292851145a03a124f3 Mon Sep 17 00:00:00 2001
From: Chris Dent <cdent@anticdent.org>
Date: Thu, 16 Jun 2016 12:48:59 +0100
Subject: [PATCH] Correct concurrency of gabbi tests for gabbi 1.22.0

When running gabbi under testr, concurrency grouping is controlled
by a regex in .testr.conf. A module name change in gabbi 1.22.0
inadvertently broke the grouping. This change should work for
old and new versions.

Change-Id: I0d963da7e0a5d3edd046a885312e2fd9cd02a974
---
 .testr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 899933061..cafb2f6e3 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,4 +2,4 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} ${PYTHON:-python} -m subunit.run discover -t . ${OS_TEST_PATH:-gnocchi/tests} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
-group_regex=(gabbi\.driver.test_gabbi_[^_]+)_
+group_regex=(gabbi\.(suitemaker|driver)\.test_gabbi_([^_]+))_