From 11ddd3f99be73b42a5b95d2f0855f47411d227c6 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 16 Apr 2015 11:04:54 +0200 Subject: [PATCH] Added debian/patches/using-assertRegexp-instead-of-Regex.patch Rewritten-From: 8f596a84c913668db0037ca30e80ec6d99e94c25 --- xenial/debian/patches/series | 1 + .../using-assertRegexp-instead-of-Regex.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 35818fbc..8055e2e5 100644 --- a/xenial/debian/patches/series +++ b/xenial/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/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch b/xenial/debian/patches/using-assertRegexp-instead-of-Regex.patch new file mode 100644 index 00000000..10000428 --- /dev/null +++ b/xenial/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 +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)) -- 2.45.2