Merge lp:~corey.bryant/cinder/2014.1.4 into lp:~ubuntu-server-dev/cinder/icehouse

[Corey Bryant]

[lp:~corey.bryant/cinder/2014.1.4]

187. By Corey Bryant on 2015-03-20

* Support new version of Python 2.7 (LP: #1434575):
  - d/p/pep-0476.patch: PEP 476 updates.
  - d/p/ignore-http-proxy-during-test.patch: PEP 476 updates.

[Martin Pitt (pitti)]

This looks obsolete.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-19 08:54:59 +0000
+++ debian/changelog	2015-03-20 15:45:25 +0000
@@ -1,3 +1,11 @@
+cinder (1:2014.1.4-0ubuntu1.1) UNRELEASED; urgency=medium
+
+  * Support new version of Python 2.7 (LP: #1434575):
+    - d/p/pep-0476.patch: PEP 476 updates.
+    - d/p/ignore-http-proxy-during-test.patch: PEP 476 updates.
+
+ -- Corey Bryant <[e-mail]>  Fri, 20 Mar 2015 08:50:38 -0400
+
 cinder (1:2014.1.4-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (93de51d) (LP: #1432608):

=== added file 'debian/patches/ignore-http-proxy-during-test.patch'
--- debian/patches/ignore-http-proxy-during-test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ignore-http-proxy-during-test.patch	2015-03-20 15:45:25 +0000
@@ -0,0 +1,79 @@
+Description: Ignore HTTP_PROXY during test requests
+Author: Angus Lees <[e-mail]>
+Forwarded: https://review.openstack.org/#/c/166268
+
+urllib2 follows http_proxy/HTTP_PROXY by default.  If a (non-local)
+proxy is set and a test tries to connect to localhost:$port, it will
+instead attempt to connect to $port on the proxy and (presumably) fail.
+
+This change forces the two tests that failed in the presence of
+HTTP_PROXY to connect directly.
+
+Change-Id: Ia12c91b356f0ccebf874933ff459aa2faa190655
+---
+ cinder/tests/integrated/integrated_helpers.py |  5 +++++
+ cinder/tests/test_wsgi.py                     | 11 ++++++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+--- a/cinder/tests/integrated/integrated_helpers.py
++++ b/cinder/tests/integrated/integrated_helpers.py
+@@ -21,6 +21,8 @@
+ import string
+ import uuid
+ 
++import fixtures
++
+ from cinder.openstack.common import log as logging
+ from cinder import service
+ from cinder import test  # For the flags
+@@ -62,6 +64,9 @@
+         self.flags(**f)
+         self.flags(verbose=True)
+ 
++        for var in ('http_proxy', 'HTTP_PROXY'):
++            self.useFixture(fixtures.EnvironmentVariable(var))
++
+         # set up services
+         self.volume = self.start_service('volume')
+         self.scheduler = self.start_service('scheduler')
+--- a/cinder/tests/test_wsgi.py
++++ b/cinder/tests/test_wsgi.py
+@@ -37,6 +37,11 @@
+                                'var'))
+ 
+ 
++def open_no_proxy(*args, **kwargs):
++    opener = urllib2.build_opener(urllib2.ProxyHandler({}))
++    return opener.open(*args, **kwargs)
++
++
+ class TestLoaderNothingExists(test.TestCase):
+     """Loader tests where os.path.exists always returns False."""
+ 
+@@ -142,7 +147,7 @@
+         server = cinder.wsgi.Server("test_app", hello_world)
+         server.start()
+ 
+-        response = urllib2.urlopen('http://127.0.0.1:%d/' % server.port)
++        response = open_no_proxy('http://127.0.0.1:%d/' % server.port)
+         self.assertEqual(greetings, response.read())
+ 
+         server.stop()
+@@ -162,7 +167,7 @@
+         server = cinder.wsgi.Server("test_app", hello_world)
+         server.start()
+ 
+-        response = urllib2.urlopen('https://127.0.0.1:%d/' % server.port)
++        response = open_no_proxy('https://127.0.0.1:%d/' % server.port)
+         self.assertEqual(greetings, response.read())
+ 
+         server.stop()
+@@ -187,7 +192,7 @@
+                                     port=0)
+         server.start()
+ 
+-        response = urllib2.urlopen('https://[::1]:%d/' % server.port)
++        response = open_no_proxy('https://[::1]:%d/' % server.port)
+         self.assertEqual(greetings, response.read())
+ 
+         server.stop()

=== added file 'debian/patches/pep-0476.patch'
--- debian/patches/pep-0476.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/pep-0476.patch	2015-03-20 15:45:25 +0000
@@ -0,0 +1,47 @@
+Description: Deal with PEP-0476 certificate chaining checking
+Author: Corey Bryant <[e-mail]>
+Forwarded: https://review.openstack.org/#/c/166263
+
+PEP-0476 introduced more thorough certificate chain verfication
+for HTTPS connectivity; this was introduced in Python 2.7.9, and
+breaks a number of unit tests in the cinder codebase.
+
+Disable certificate chain verification for cinder SSL tests
+using the backwards compatible SSLContext provided for this
+purpose.
+
+Change-Id: Iffc3658196f608c7a7c9b6527dc8e7210fb05bff
+Closes-Bug: #1403068
+---
+ cinder/tests/test_wsgi.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/cinder/tests/test_wsgi.py
++++ b/cinder/tests/test_wsgi.py
+@@ -18,6 +18,7 @@
+ 
+ import mock
+ import os.path
++import ssl
+ import tempfile
+ import urllib2
+ 
+@@ -38,7 +39,17 @@
+ 
+ 
+ def open_no_proxy(*args, **kwargs):
+-    opener = urllib2.build_opener(urllib2.ProxyHandler({}))
++    # NOTE(coreycb):
++    # Deal with more secure certification chain verficiation
++    # introduced in python 2.7.9 under PEP-0476
++    # https://github.com/python/peps/blob/master/pep-0476.txt
++    if hasattr(ssl, "_create_unverified_context"):
++        opener = urllib2.build_opener(
++            urllib2.ProxyHandler({}),
++            urllib2.HTTPSHandler(context=ssl._create_unverified_context())
++        )
++    else:
++        opener = urllib2.build_opener(urllib2.ProxyHandler({}))
+     return opener.open(*args, **kwargs)
+ 
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-17 17:37:44 +0000
+++ debian/patches/series	2015-03-20 15:45:25 +0000
@@ -1,1 +1,3 @@
 fix-requirements.patch
+ignore-http-proxy-during-test.patch
+pep-0476.patch