Merge lp:~corey.bryant/ubuntu/trusty/keystone/fix-for-1289935 into lp:~ubuntu-server-dev/keystone/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-12 14:03:01 +0000
+++ debian/changelog	2014-03-13 05:14:26 +0000
@@ -1,9 +1,21 @@
+<<<<<<< TREE
 keystone (1:2014.1~b3+master-0ubuntu1) UNRELEASED; urgency=medium
 
   * d/p/*: Refreshed
 
  -- James Page <[e-mail]>  Wed, 12 Mar 2014 13:59:01 +0000
 
+=======
+keystone (1:2014.1~b3-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/*: Drop sql_connection.patch
+  * debian/rules: Drop use of sql_connection.patch
+  * debian/patches/revoke-api.patch: Add upstream patch (LP: #1289935)
+  * debian/keystone.postinst: Fix db_sync logic (LP: #1290423)
+
+ -- Corey Bryant <[e-mail]>  Wed, 12 Mar 2014 23:20:05 -0500
+
+>>>>>>> MERGE-SOURCE
 keystone (1:2014.1~b3-0ubuntu2) trusty; urgency=medium
 
   * Make test execution more verbose to avoid timeouts on buildds:

=== modified file 'debian/keystone.postinst'
--- debian/keystone.postinst	2014-03-06 18:09:17 +0000
+++ debian/keystone.postinst	2014-03-13 05:14:26 +0000
@@ -17,8 +17,8 @@
 		#su -s /bin/sh -c 'exec keystone database sync' keystone
 		;;
 	configure)
-		if ! grep -q sql_connection /etc/keystone/keystone.conf
-        then
+		if ! grep connection /etc/keystone/keystone.conf | grep -qv "connection = sqlite:////var/lib/keystone/keystone.sqlite"
+		then
 			su -s /bin/sh -c 'exec keystone-manage db_sync' keystone
 		fi
 		su -s /bin/sh -c 'exec keystone-manage pki_setup' keystone

=== added file 'debian/patches/revoke-api.patch'
--- debian/patches/revoke-api.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revoke-api.patch	2014-03-13 05:14:26 +0000
@@ -0,0 +1,70 @@
+Description: Call an existing method in sync cache for revoke events
+Origin/Author: Morgan Fainberg <[e-mail]>
+Bug: https://bugs.launchpad.net/keystone/+bug/1289935
+Index: keystone/keystone/contrib/revoke/core.py
+===================================================================
+--- keystone.orig/keystone/contrib/revoke/core.py	2014-03-06 10:21:24.000000000 -0600
++++ keystone/keystone/contrib/revoke/core.py	2014-03-12 13:23:35.636398973 -0500
+@@ -76,7 +76,7 @@
+         with self._store.get_lock(_TREE_KEY):
+             for e in self._current_events:
+                 if e.revoked_at < cutoff:
+-                    self.revoke_map.remove(e)
++                    self.revoke_map.remove_event(e)
+                     self._current_events.remove(e)
+                 else:
+                     break
+Index: keystone/keystone/tests/test_revoke.py
+===================================================================
+--- keystone.orig/keystone/tests/test_revoke.py	2014-03-06 10:21:24.000000000 -0600
++++ keystone/keystone/tests/test_revoke.py	2014-03-12 13:23:35.636398973 -0500
+@@ -14,9 +14,12 @@
+ import datetime
+ import uuid
+ 
++import mock
++
+ from keystone.common import dependency
+ from keystone import config
+ from keystone.contrib.revoke import model
++from keystone import exception
+ from keystone.openstack.common import timeutils
+ from keystone import tests
+ from keystone.tests import test_backend_sql
+@@ -137,6 +140,36 @@
+         self.revoke_api.revoke(event)
+         self.assertEqual(1, len(self.revoke_api.get_events()))
+ 
++    @mock.patch.object(timeutils, 'utcnow')
++    def test_expired_events_removed_validate_token_success(self, mock_utcnow):
++        def _sample_token_values():
++            token = _sample_blank_token()
++            token['expires_at'] = timeutils.isotime(_future_time(),
++                                                    subsecond=True)
++            return token
++
++        now = datetime.datetime.utcnow()
++        now_plus_2h = now + datetime.timedelta(hours=2)
++        mock_utcnow.return_value = now
++
++        # Build a token and validate it. This will seed the cache for the
++        # future 'synchronize' call.
++        token_values = _sample_token_values()
++
++        user_id = _new_id()
++        self.revoke_api.revoke_by_user(user_id)
++        token_values['user_id'] = user_id
++        self.assertRaises(exception.TokenNotFound,
++                          self.revoke_api.check_token,
++                          token_values)
++
++        # Move our clock forward by 2h, build a new token and validate it.
++        # 'synchronize' should now be exercised and remove old expired events
++        mock_utcnow.return_value = now_plus_2h
++        self.revoke_api.revoke_by_expiration(_new_id(), now_plus_2h)
++        #should no longer throw an exception
++        self.revoke_api.check_token(token_values)
++
+ 
+ class SqlRevokeTests(test_backend_sql.SqlTests, RevokeTests):
+     def setUp(self):

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-28 14:24:52 +0000
+++ debian/patches/series	2014-03-13 05:14:26 +0000
@@ -1,5 +1,5 @@
 fix-ubuntu-tests.patch
-sql_connection.patch
 ubuntu-test-overrides.patch
 #add-version-info.patch
 ubuntu-oslo.sphinx.patch
+revoke-api.patch

=== renamed file 'debian/patches/sql_connection.patch' => 'debian/patches/sql_connection.patch.THIS'
=== modified file 'debian/rules'
--- debian/rules	2014-03-06 21:37:15 +0000
+++ debian/rules	2014-03-13 05:14:26 +0000
@@ -12,10 +12,8 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	patch -p1 -R < debian/patches/sql_connection.patch
 	mkdir -p $(CURDIR)/keystone/tests/tmp
 	./run_tests.sh -N -P
-	patch -p1 < debian/patches/sql_connection.patch
 endif
 
 override_dh_auto_build: