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

diff --git a/debian/patches/series b/debian/patches/series
index 25c0f244e6c3528dd5e85c9e11d2537f261ba6ad..1a5148a7ff356ed0169ece91119ab47035218a0a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 install-missing-files.patch
+using-assertRaisesRegexp-with-lasting-p.patch

diff --git a/debian/patches/using-assertRaisesRegexp-with-lasting-p.patch b/debian/patches/using-assertRaisesRegexp-with-lasting-p.patch
new file mode 100644 (file)
index 0000000..25462ec
--- /dev/null
+++ b/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):