Merge lp:~zulcss/keystone/oauth-refresh into lp:~ubuntu-server-dev/keystone/havana

[Chuck Short]

- Refreshed oauth patch.

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-20 18:06:14 +0000
+++ debian/changelog	2013-09-24 13:46:00 +0000
@@ -9,6 +9,7 @@
       and python-setuptools as a build dependency.
     - Dropped python-swift, python-unittest as a build dependency
     - Bumped versioned depends for python-keystoneclient.
+  * debian/patches/disable-oauth2.patch: Refreshed
 
  -- Chuck Short <[e-mail]>  Fri, 20 Sep 2013 13:15:21 -0400
 

=== modified file 'debian/patches/disable-oauth2.patch'
--- debian/patches/disable-oauth2.patch	2013-09-12 19:24:29 +0000
+++ debian/patches/disable-oauth2.patch	2013-09-24 13:46:00 +0000
@@ -2,10 +2,10 @@
 Author: Chuck Short <[e-mail]>
 Fowarded: No
 diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index f86311e..1680fd9 100644
+index d7e1c44..4d1adc1 100644
 --- a/etc/keystone.conf.sample
 +++ b/etc/keystone.conf.sample
-@@ -228,6 +228,7 @@
+@@ -284,6 +284,7 @@
  # cache_time =
  
  [oauth1]
@@ -47,7 +47,7 @@
  
  
 diff --git a/keystone/tests/test_v3_oauth1.py b/keystone/tests/test_v3_oauth1.py
-index bb2e00c..25d2d5a 100644
+index fb9a55e..52857b2 100644
 --- a/keystone/tests/test_v3_oauth1.py
 +++ b/keystone/tests/test_v3_oauth1.py
 @@ -19,6 +19,8 @@ import os
@@ -59,7 +59,19 @@
  from keystone.common import cms
  from keystone.common.sql import migration
  from keystone import config
-@@ -54,11 +56,14 @@ class OAuth1Tests(test_v3.RestfulTestCase):
+@@ -43,7 +45,10 @@ class OAuth1Tests(test_v3.RestfulTestCase):
+                                                self.EXTENSION_NAME)
+         package = importutils.import_module(package_name)
+         self.repo_path = os.path.abspath(os.path.dirname(package.__file__))
+-        migration.db_version_control(version=None, repo_path=self.repo_path)
++        try:
++            migration.db_version_control(version=None, repo_path=self.repo_path)
++        except:
++            raise nose.exc.SkipTest('Skipped by Ubuntu')
+         migration.db_sync(version=None, repo_path=self.repo_path)
+ 
+     def setUp(self):
+@@ -54,11 +59,14 @@ class OAuth1Tests(test_v3.RestfulTestCase):
          self.controller = controllers.OAuthControllerV3()
  
      def _create_single_consumer(self):
@@ -79,7 +91,7 @@
  
      def _oauth_request(self, consumer, token=None, **kw):
          return oauth1.Request.from_consumer_and_token(consumer=consumer,
-@@ -214,7 +219,10 @@ class OAuthFlowTests(OAuth1Tests):
+@@ -214,7 +222,10 @@ class OAuthFlowTests(OAuth1Tests):
          consumer = self._create_single_consumer()
          consumer_id = consumer.get('id')
          consumer_secret = consumer.get('secret')
@@ -91,7 +103,7 @@
          self.assertIsNotNone(self.consumer.key)
  
          url, headers = self._create_request_token(self.consumer,
-@@ -442,7 +450,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+@@ -442,7 +453,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
      def test_bad_consumer_secret(self):
          consumer = self._create_single_consumer()
          consumer_id = consumer.get('id')
@@ -103,7 +115,7 @@
          url, headers = self._create_request_token(consumer,
                                                    self.project_id)
          self.post(url, headers=headers, expected_status=500)
-@@ -451,7 +462,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+@@ -451,7 +465,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
          consumer = self._create_single_consumer()
          consumer_id = consumer.get('id')
          consumer_secret = consumer.get('secret')
@@ -115,31 +127,31 @@
          url, headers = self._create_request_token(consumer,
                                                    self.project_id)
          self.post(url, headers=headers)
-@@ -463,7 +477,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
-         consumer = self._create_single_consumer()
-         consumer_id = consumer.get('id')
-         consumer_secret = consumer.get('secret')
--        consumer = oauth1.Consumer(consumer_id, consumer_secret)
-+        try:
-+            consumer = oauth1.Consumer(consumer_id, consumer_secret)
-+        except:
-+            raise nose.exc.SkipTest('Skipped by Ubuntu')
- 
-         url, headers = self._create_request_token(consumer,
-                                                   self.project_id)
-@@ -488,7 +505,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
-         consumer = self._create_single_consumer()
-         consumer_id = consumer.get('id')
-         consumer_secret = consumer.get('secret')
--        consumer = oauth1.Consumer(consumer_id, consumer_secret)
-+        try:
-+            consumer = oauth1.Consumer(consumer_id, consumer_secret)
-+        except:
-+            raise nose.exc.SkipTest('Skipped by Ubuntu')
- 
-         url, headers = self._create_request_token(consumer,
-                                                   self.project_id)
-@@ -510,7 +530,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+@@ -463,7 +480,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+         consumer = self._create_single_consumer()
+         consumer_id = consumer.get('id')
+         consumer_secret = consumer.get('secret')
+-        consumer = oauth1.Consumer(consumer_id, consumer_secret)
++        try:
++            consumer = oauth1.Consumer(consumer_id, consumer_secret)
++        except:
++            raise nose.exc.SkipTest('Skipped by Ubuntu')
+ 
+         url, headers = self._create_request_token(consumer,
+                                                   self.project_id)
+@@ -488,7 +508,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+         consumer = self._create_single_consumer()
+         consumer_id = consumer.get('id')
+         consumer_secret = consumer.get('secret')
+-        consumer = oauth1.Consumer(consumer_id, consumer_secret)
++        try:
++            consumer = oauth1.Consumer(consumer_id, consumer_secret)
++        except:
++            raise nose.exc.SkipTest('Skipped by Ubuntu')
+ 
+         url, headers = self._create_request_token(consumer,
+                                                   self.project_id)
+@@ -510,7 +533,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
          consumer = self._create_single_consumer()
          consumer_id = consumer.get('id')
          consumer_secret = consumer.get('secret')
@@ -151,7 +163,7 @@
          self.assertIsNotNone(self.consumer.key)
  
          url, headers = self._create_request_token(self.consumer,
-@@ -531,7 +554,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
+@@ -531,7 +557,10 @@ class MaliciousOAuth1Tests(OAuth1Tests):
          consumer = self._create_single_consumer()
          consumer_id = consumer.get('id')
          consumer_secret = consumer.get('secret')
@@ -173,4 +185,6 @@
  Babel>=0.9.6
 -oauth2
  dogpile.cache>=0.5.0
+-- 
+1.8.3.2