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 7ebb60f8272ae07f6e8d348082b3b5efa73fca4e..b8ea60012f42277f641ff8ae4d8b0769f30859f7 100644 (file)
--- 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 (file)
index d4d91c7..0000000
--- 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 <zigo@debian.org>
-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))