Merge lp:~zulcss/python-keystoneclient/0.3.2 into lp:~ubuntu-server-dev/python-keystoneclient/havana

[Chuck Short]

0.3.2 release of python-keystoneclient

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-12 13:24:18 +0000
+++ debian/changelog	2013-09-06 17:54:19 +0000
@@ -1,8 +1,10 @@
-python-keystoneclient (1:0.3.1-0ubuntu2) UNRELEASED; urgency=low
+python-keystoneclient (1:0.3.2-0ubuntu1) saucy; urgency=low
 
+  * New upstream release.
   * debian/control: Add python-netaddr as a build dependency. 
+  * debian/patches/skip-tests-ubuntu.patch: Refreshed
 
- -- Chuck Short <[e-mail]> Mon, 12 Aug 2013 13:14:08 +0000
+ -- Chuck Short <[e-mail]>  Fri, 06 Sep 2013 13:51:49 -0400
 
 python-keystoneclient (1:0.3.1-0ubuntu1) saucy; urgency=low
 

=== modified file 'debian/patches/skip-tests-ubuntu.patch'
--- debian/patches/skip-tests-ubuntu.patch	2013-08-19 20:21:36 +0000
+++ debian/patches/skip-tests-ubuntu.patch	2013-09-06 17:54:19 +0000
@@ -1,8 +1,7 @@
-diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py
-index 4395225..d3daf49 100644
---- a/tests/test_auth_token_middleware.py
-+++ b/tests/test_auth_token_middleware.py
-@@ -871,6 +871,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
+diff -Naurp python-keystoneclient-0.3.2.orig/tests/test_auth_token_middleware.py python-keystoneclient-0.3.2/tests/test_auth_token_middleware.py
+--- python-keystoneclient-0.3.2.orig/tests/test_auth_token_middleware.py	2013-08-22 19:08:11.000000000 -0400
++++ python-keystoneclient-0.3.2/tests/test_auth_token_middleware.py	2013-09-06 13:45:46.137282469 -0400
+@@ -612,6 +612,7 @@ class AuthTokenMiddlewareTest(BaseAuthTo
          self.assert_valid_last_url(self.token_dict['uuid_token_default'])
  
      def test_valid_signed_request(self):
@@ -10,7 +9,7 @@
          self.middleware.http_client_class.last_requested_url = ''
          self.assert_valid_request_200(
              self.token_dict['signed_token_scoped'])
-@@ -1063,6 +1064,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
+@@ -798,6 +799,7 @@ class AuthTokenMiddlewareTest(BaseAuthTo
          return self.middleware._cache_get(token_id, ignore_expires=True)
  
      def test_memcache(self):
@@ -18,7 +17,7 @@
          req = webob.Request.blank('/')
          token = self.token_dict['signed_token_scoped']
          req.headers['X-Auth-Token'] = token
-@@ -1085,6 +1087,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
+@@ -820,6 +822,7 @@ class AuthTokenMiddlewareTest(BaseAuthTo
                            self._get_cached_token, token)
  
      def test_memcache_set_expired(self, extra_conf={}, extra_environ={}):
@@ -26,18 +25,17 @@
          token_cache_time = 10
          conf = {
              'token_cache_time': token_cache_time,
-@@ -1319,6 +1322,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
-         self.assert_unscoped_default_tenant_auto_scopes(UUID_TOKEN_DEFAULT)
+@@ -1116,6 +1119,7 @@ class v2AuthTokenMiddlewareTest(BaseAuth
+             client_fixtures.UUID_TOKEN_DEFAULT)
  
      def test_default_tenant_signed_token(self):
 +        return
-         self.assert_unscoped_default_tenant_auto_scopes(SIGNED_TOKEN_SCOPED)
+         self.assert_unscoped_default_tenant_auto_scopes(
+             client_fixtures.SIGNED_TOKEN_SCOPED)
  
-     def assert_unscoped_token_receives_401(self, token):
-diff --git a/tests/test_http.py b/tests/test_http.py
-index 9ab3dcc..947c0a1 100644
---- a/tests/test_http.py
-+++ b/tests/test_http.py
+diff -Naurp python-keystoneclient-0.3.2.orig/tests/test_http.py python-keystoneclient-0.3.2/tests/test_http.py
+--- python-keystoneclient-0.3.2.orig/tests/test_http.py	2013-08-22 19:08:11.000000000 -0400
++++ python-keystoneclient-0.3.2/tests/test_http.py	2013-09-06 13:47:00.713282505 -0400
 @@ -17,7 +17,10 @@
  import json
  import mock
@@ -50,7 +48,7 @@
  import requests
  import testtools
  from testtools import matchers
-@@ -160,7 +163,10 @@ class BasicRequestTests(testtools.TestCase):
+@@ -173,7 +176,10 @@ class BasicRequestTests(testtools.TestCa
      def setUp(self):
          super(BasicRequestTests, self).setUp()
          self.logger = FakeLog()
@@ -62,6 +60,3 @@
  
      def tearDown(self):
          httpretty.disable()
--- 
-1.8.3.2
-