From: Thomas Goirand Date: Mon, 3 Aug 2015 13:55:00 +0000 (+0000) Subject: Removed debian/patches/using-assertRegexp-instead-of-Regex.patch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=833faa21ce3feea8fe2d7b225e695ad13aa0cc08;p=openstack-build%2Fheat-build.git Removed debian/patches/using-assertRegexp-instead-of-Regex.patch Rewritten-From: 7eedfc45ba10fd83c60f5ebdab91aca4d913ead7 --- diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 7ebb60f8..b8ea6001 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,3 +1,2 @@ only-run-tests-in-heat.tests.patch -using-assertRegexp-instead-of-Regex.patch allow-route-2.0.patch diff --git a/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch b/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch deleted file mode 100644 index d4d91c78..00000000 --- a/trusty/debian/patches/using-assertRegexp-instead-of-Regex.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - -Index: heat/heat/tests/test_software_deployment.py -=================================================================== ---- heat.orig/heat/tests/test_software_deployment.py -+++ heat/heat/tests/test_software_deployment.py -@@ -1005,7 +1005,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) - container = m.group(1) - self.assertEqual(object_name, m.group(2))