Added debian/patches/using-assertRegexp-instead-of-Regex.patch

Rewritten-From: 8f596a84c913668db0037ca30e80ec6d99e94c25

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 35818fbccdeb48340de67a09eab53f102296276f..8055e2e581d74f7bedba8118dea2668b3bd3aa5b 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,2 +1,3 @@
 allow-route-2.0.patch
 only-run-tests-in-heat.tests.patch
+using-assertRegexp-instead-of-Regex.patch

diff --git a/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch b/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch
new file mode 100644 (file)
index 0000000..1000042
--- /dev/null
+++ b/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch
@@ -0,0 +1,19 @@
+Description: Adding a p to self.assertRegex
+ The version in Debian doesn't have the last letter of self.assertRegexp.
+ This patch goes backward in time and fixes that, to allow the unit test
+ to pass.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2015-04-16
+
+--- heat-2015.1~rc1.orig/heat/tests/test_software_deployment.py
++++ heat-2015.1~rc1/heat/tests/test_software_deployment.py
+@@ -951,7 +951,7 @@ class SoftwareDeploymentTest(common.Heat
+             '^http://192.0.2.1/v1/AUTH_test_tenant_id/'
+             '(software_deployment_test_stack-deployment_mysql-.*)/(.*)'
+             '\\?temp_url_sig=.*&temp_url_expires=\\d*$')
+-        self.assertRegex(temp_url, temp_url_pattern)
++        self.assertRegexp(temp_url, temp_url_pattern)
+         m = temp_url_pattern.search(temp_url)
+         object_name = m.group(2)
+         self.assertEqual(container, m.group(1))