From 84551f03db986995be5b605dae8202f33380e5f2 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 18 May 2016 10:21:41 +0200
Subject: [PATCH]   * Also blacklist test_create_delete_cgsnapshot which is
 non-deterministically     failing (Closes: #824595).

Rewritten-From: 4ea7b678d6b8183c789fbb09cc98959baf983b11
---
 trusty/debian/changelog | 7 +++++++
 trusty/debian/rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index e4baccb8d..b554dd9fd 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+cinder (2:8.0.0-3) unstable; urgency=medium
+
+  * Also blacklist test_create_delete_cgsnapshot which is non-deterministically
+    failing (Closes: #824595).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 18 May 2016 10:20:47 +0200
+
 cinder (2:8.0.0-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/trusty/debian/rules b/trusty/debian/rules
index eacb5a4ec..3ef0c64b5 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -15,7 +15,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 		rm -rf .testrepository ; \
 		testr-python$$PYMAJOR init ; \
 		TEMP_REZ=`mktemp -t` ; \
-		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'cinder\.tests\.unit\.(?!.*test_volume\.VolumeTestCase\.test_create_delete_volume.*)' | tee $$TEMP_REZ | subunit2pyunit ; \
+		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'cinder\.tests\.unit\.(?!(.*test_volume\.VolumeTestCase\.test_create_delete_volume.*|.*test_volume\.ConsistencyGroupTestCase\.test_create_delete_cgsnapshot.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
 		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
 		rm -f $$TEMP_REZ ; \
 		testr-python$$PYMAJOR slowest ; \
-- 
2.45.2