From: Thomas Goirand <zigo@debian.org>
Date: Fri, 17 Apr 2015 21:58:23 +0000 (+0200)
Subject: Adds debian/patches/using-assertRaisesRegexp-with-lasting-p.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cae935e5a959118c582aaa6dd7a6e3801c6a2fca;p=openstack-build%2Fcinder-build.git

Adds debian/patches/using-assertRaisesRegexp-with-lasting-p.patch

Rewritten-From: 24509c2ed001a25d412edb7ba3dfdd7fdd33ea8e
---

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 25c0f244e..1a5148a7f 100644
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1 +1,2 @@
 install-missing-files.patch
+using-assertRaisesRegexp-with-lasting-p.patch
diff --git a/xenial/debian/patches/using-assertRaisesRegexp-with-lasting-p.patch b/xenial/debian/patches/using-assertRaisesRegexp-with-lasting-p.patch
new file mode 100644
index 000000000..25462eccc
--- /dev/null
+++ b/xenial/debian/patches/using-assertRaisesRegexp-with-lasting-p.patch
@@ -0,0 +1,17 @@
+Description: Adds a p after assertRaisesRegex()
+ The new version isn't in Debian, so we fix it.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2015-04-17
+
+--- cinder-2015.1~rc1.orig/cinder/tests/objects/test_objects.py
++++ cinder-2015.1~rc1/cinder/tests/objects/test_objects.py
+@@ -438,7 +438,7 @@ class _TestObject(object):
+         class Foo(base.CinderObject):
+             fields = {'foobar': fields.Field(fields.Integer())}
+         obj = Foo()
+-        with self.assertRaisesRegex(NotImplementedError, ".*foobar.*"):
++        with self.assertRaisesRegexp(NotImplementedError, ".*foobar.*"):
+             obj.foobar
+ 
+     def test_loaded_in_primitive(self):