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

[Corey Bryant]

[Ryan Hsu (rhsu)]

I noticed that oslo.serialization is now a dependency for python-keystone. Shouldn't python-oslo.serialization be added to the control file?

[James Page (james-page)]

As we skip this part of the test suite:

# only for Keystone tests running against keystoneclient master
oslo.serialization>=0.1.0,<1.1 # Apache-2.0

I think we're probably OK without it.

Testing now.

[James Page (james-page)]

review: Approve

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

281. By James Page on 2015-03-19

releasing package keystone version 1:2014.1.4-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-10 16:54:50 +0000
+++ debian/changelog	2015-03-16 20:49:58 +0000
@@ -1,3 +1,18 @@
+keystone (1:2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (9aec35a) (LP: #1432608):
+    - [d72e6fa] Correct initialization order for logging to use eventlet locks
+    - [0967058] Additional test coverage for password changes
+    - [f45f678] Keystoneclient tests from venv-installed client
+    - [5d2e2ce] Fix race on default role creation
+    - [35d937d] Fix test_provider_token_expiration_validation transient failure
+    - [3817e75] Make sure scoping to the project of a disabled domain result in 401.
+    - [9aec35a] Add oslo.serialization for latest keystoneclient
+  * d/p/fix-requirements.patch: Rebased
+  * d/p/fix-ubuntu-tests.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 16 Mar 2015 14:39:54 -0400
+
 keystone (1:2014.1.3-0ubuntu2) trusty; urgency=medium
 
   [ Edward Hope-Morley ]

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-03 13:46:41 +0000
+++ debian/patches/fix-requirements.patch	2015-03-16 20:49:58 +0000
@@ -10,5 +10,5 @@
 -six>=1.6.0
 +six>=1.5.2
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
  passlib

=== modified file 'debian/patches/fix-ubuntu-tests.patch'
--- debian/patches/fix-ubuntu-tests.patch	2014-03-25 17:21:19 +0000
+++ debian/patches/fix-ubuntu-tests.patch	2015-03-16 20:49:58 +0000
@@ -1,31 +1,6 @@
-diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
-index aaa5d9f..a9822fb 100644
---- a/keystone/tests/test_keystoneclient.py
-+++ b/keystone/tests/test_keystoneclient.py
-@@ -62,12 +62,12 @@ class CompatTestCase(tests.NoModule, tests.TestCase):
- 
-         self.addCleanup(self.cleanup_instance('public_server', 'admin_server'))
- 
--        if isinstance(self.checkout_info, str):
--            revdir = self.checkout_info
--        else:
--            revdir = tests.checkout_vendor(*self.checkout_info)
--        self.add_path(revdir)
--        self.clear_module('keystoneclient')
-+        #if isinstance(self.checkout_info, str):
-+        #    revdir = self.checkout_info
-+        #else:
-+        #    revdir = tests.checkout_vendor(*self.checkout_info)
-+        #self.add_path(revdir)
-+        #self.clear_module('keystoneclient')
- 
-     def _public_url(self):
-         public_port = self.public_server.socket_info['socket'][1]
-diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/test_token_provider.py
-index 926c09d..dfc8be0 100644
 --- a/keystone/tests/test_token_provider.py
 +++ b/keystone/tests/test_token_provider.py
-@@ -812,6 +812,7 @@ class TestTokenProvider(tests.TestCase):
+@@ -803,6 +803,7 @@
                           'my.package.MyProvider')
  
      def test_provider_token_expiration_validation(self):
@@ -33,4 +8,3 @@
          self.assertRaises(exception.TokenNotFound,
                            self.token_provider_api._is_valid_token,
                            SAMPLE_V2_TOKEN_EXPIRED)
-