Hello community,
here is the log from the commit of package python-keystoneclient for
openSUSE:Factory checked in at 2013-09-27 18:01:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-keystoneclient (Old)
and /work/SRC/openSUSE:Factory/.python-keystoneclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-keystoneclient"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-keystoneclient/python-keystoneclient.changes
2013-09-26 16:03:15.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-keystoneclient.new/python-keystoneclient.changes
2013-09-27 18:01:57.000000000 +0200
@@ -1,0 +2,19 @@
+Fri Sep 27 15:08:04 UTC 2013 - [email protected]
+
+- add 0001-Make-ROOTDIR-determination-more-robust.patch
+
+-------------------------------------------------------------------
+Fri Sep 27 06:32:41 UTC 2013 - [email protected]
+
+- Update to version 0.3.2.78:
+ + Move tests in keystoneclient
+ + Fix misused assertTrue in unit tests
+
+-------------------------------------------------------------------
+Wed Sep 25 00:10:34 UTC 2013 - [email protected]
+
+- Update to version 0.3.2.75:
+ + Modify keyring tests to test authentication
+ + Require oslo.config 1.2.0 final
+
+-------------------------------------------------------------------
New:
----
0001-Make-ROOTDIR-determination-more-robust.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-keystoneclient.spec ++++++
--- /var/tmp/diff_new_pack.PdQ53g/_old 2013-09-27 18:01:58.000000000 +0200
+++ /var/tmp/diff_new_pack.PdQ53g/_new 2013-09-27 18:01:58.000000000 +0200
@@ -19,7 +19,7 @@
%define component keystoneclient
Name: python-%{component}
-Version: 0.3.2.72
+Version: 0.3.2.78
Release: 0
Summary: Openstack Identity (Keystone) API Client
License: Apache-2.0
@@ -28,6 +28,7 @@
Source: python-keystoneclient-master.tar.gz
Source2: openstack-keystone.sh
Patch0: 0001-Add-workaround-for-OSError-raised-by-Popen.communica.patch
+Patch1: 0001-Make-ROOTDIR-determination-more-robust.patch
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: python-base
@@ -98,11 +99,10 @@
This package contains testsuite files for %{name}.
%prep
-%setup -q -n python-keystoneclient-0.3.2.72.g38aa12b
+%setup -q -n python-keystoneclient-0.3.2.78.gbaa9490
%patch0 -p1
+%patch1 -p1
%openstack_cleanup_prep
-# Fix example PKI certs location for testsuite:
-sed -i "s|python-keystoneclient/examples|python-keystoneclient-test/examples|"
tests/test_auth_token_middleware.py
%build
python setup.py build
++++++ 0001-Add-workaround-for-OSError-raised-by-Popen.communica.patch ++++++
--- /var/tmp/diff_new_pack.PdQ53g/_old 2013-09-27 18:01:58.000000000 +0200
+++ /var/tmp/diff_new_pack.PdQ53g/_new 2013-09-27 18:01:58.000000000 +0200
@@ -1,4 +1,4 @@
-From 3c260985b473ff49e118eaceda57b7b475c291a6 Mon Sep 17 00:00:00 2001
+From 52c34736056bf13f51c9a167fb29214a300c41f2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <[email protected]>
Date: Thu, 20 Jun 2013 18:49:26 +0200
Subject: [PATCH] Add workaround for OSError raised by Popen.communicate()
@@ -13,25 +13,25 @@
case of an OSError. So just fake it instead.
Add basic unit tests to cover all of the public methods from
-keystone.common.cms, raising test coverage to 77%.
+keystone.common.cms, raising test coverage to 77%. Add
+unit test for this specific bug (test_cms_verify_token_no_oserror).
Change-Id: I6e650ab9494c605b4e41c78c87a9505e09d5fc29
---
- keystoneclient/common/cms.py | 43 +++++++++++++++++++++---
- tests/client_fixtures.py | 14 ++++++--
- tests/test_auth_token_middleware.py | 65 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 115 insertions(+), 7 deletions(-)
+ keystoneclient/common/cms.py | 42 +++++++++++--
+ keystoneclient/tests/client_fixtures.py | 14 ++++-
+ keystoneclient/tests/test_auth_token_middleware.py | 73 ++++++++++++++++++++++
+ 3 files changed, 122 insertions(+), 7 deletions(-)
diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py
-index 8bc24f9..a4c231b 100644
+index 8bc24f9..d6a1753 100644
--- a/keystoneclient/common/cms.py
+++ b/keystoneclient/common/cms.py
-@@ -38,6 +38,37 @@ def _ensure_subprocess():
+@@ -38,6 +38,36 @@ def _ensure_subprocess():
import subprocess # noqa
+def _fake_openssl_error(files):
-+ """Check if any of the files cannot be opened."""
+ err = 'Error while writing to pipe.'
+ try:
+ for try_file in files:
@@ -64,7 +64,7 @@
def cms_verify(formatted, signing_cert_file_name, ca_file_name):
"""Verifies the signature of the contents IAW CMS syntax.
-@@ -53,8 +84,10 @@ def cms_verify(formatted, signing_cert_file_name,
ca_file_name):
+@@ -53,8 +83,10 @@ def cms_verify(formatted, signing_cert_file_name,
ca_file_name):
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
@@ -77,7 +77,7 @@
if retcode:
# Do not log errors, as some happen in the positive thread
# instead, catch them in the calling code and log them there.
-@@ -150,8 +183,10 @@ def cms_sign_text(text, signing_cert_file_name,
signing_key_file_name):
+@@ -150,8 +182,10 @@ def cms_sign_text(text, signing_cert_file_name,
signing_key_file_name):
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
@@ -90,20 +90,20 @@
if retcode or "Error" in err:
LOG.error('Signing error: %s' % err)
raise subprocess.CalledProcessError(retcode, "openssl")
-diff --git a/tests/client_fixtures.py b/tests/client_fixtures.py
-index 0abb06e..fe1441b 100644
---- a/tests/client_fixtures.py
-+++ b/tests/client_fixtures.py
-@@ -25,7 +25,7 @@ from keystoneclient import utils
- ROOTDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
- CERTDIR = os.path.join(ROOTDIR, "examples/pki/certs")
- CMSDIR = os.path.join(ROOTDIR, "examples/pki/cms")
+diff --git a/keystoneclient/tests/client_fixtures.py
b/keystoneclient/tests/client_fixtures.py
+index dd1c95f..c17db42 100644
+--- a/keystoneclient/tests/client_fixtures.py
++++ b/keystoneclient/tests/client_fixtures.py
+@@ -26,7 +26,7 @@ CLIENTDIR =
os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+ ROOTDIR = os.path.dirname(CLIENTDIR)
+ CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
+ CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
-
-+KEYDIR = os.path.join(ROOTDIR, "examples/pki/private")
++KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
# @TODO(mordred) This should become a testresources resource attached to the
# class
-@@ -48,9 +48,17 @@ with open(os.path.join(CMSDIR, 'revocation_list.json')) as
f:
+@@ -49,9 +49,17 @@ with open(os.path.join(CMSDIR, 'revocation_list.json')) as
f:
REVOCATION_LIST = jsonutils.loads(f.read())
with open(os.path.join(CMSDIR, 'revocation_list.pem')) as f:
SIGNED_REVOCATION_LIST = jsonutils.dumps({'signed': f.read()})
@@ -123,10 +123,10 @@
SIGNING_CA = f.read()
UUID_TOKEN_DEFAULT = "ec6c0710ec2f471498484c1b53ab4f9d"
-diff --git a/tests/test_auth_token_middleware.py
b/tests/test_auth_token_middleware.py
-index 17eacb6..e1fdc1b 100644
---- a/tests/test_auth_token_middleware.py
-+++ b/tests/test_auth_token_middleware.py
+diff --git a/keystoneclient/tests/test_auth_token_middleware.py
b/keystoneclient/tests/test_auth_token_middleware.py
+index 06e7609..98271d6 100644
+--- a/keystoneclient/tests/test_auth_token_middleware.py
++++ b/keystoneclient/tests/test_auth_token_middleware.py
@@ -19,6 +19,7 @@ import iso8601
import os
import shutil
@@ -135,7 +135,7 @@
import sys
import tempfile
import testtools
-@@ -1218,3 +1219,67 @@ class TokenEncodingTest(testtools.TestCase):
+@@ -1218,3 +1219,75 @@ class TokenEncodingTest(testtools.TestCase):
def test_quoted_token(self):
self.assertEqual('foo%20bar', auth_token.safe_quote('foo%20bar'))
@@ -159,13 +159,13 @@
+
+ def test_ans1_token(self):
+
self.assertTrue(cms.is_ans1_token(client_fixtures.SIGNED_TOKEN_SCOPED))
-+ self.assertFalse(cms.is_ans1_token("FOOBAR"))
++ self.assertFalse(cms.is_ans1_token('FOOBAR'))
+
+ def test_cms_sign_token_no_files(self):
+ self.assertRaises(subprocess.CalledProcessError,
+ cms.cms_sign_token,
+ client_fixtures.SIGNED_TOKEN_SCOPED,
-+ "/no/such/file", "/no/such/key")
++ '/no/such/file', '/no/such/key')
+
+ def test_cms_sign_token_success(self):
+ self.assertTrue(
@@ -177,7 +177,15 @@
+ self.assertRaises(subprocess.CalledProcessError,
+ cms.cms_verify,
+ client_fixtures.SIGNED_TOKEN_SCOPED,
-+ "/no/such/file", "/no/such/key")
++ '/no/such/file', '/no/such/key')
++
++ def test_cms_verify_token_no_oserror(self):
++ try:
++ cms.cms_verify("x" * 2 ** 17, '/no/such/file', '/no/such/key')
++ except subprocess.CalledProcessError as e:
++ self.assertTrue('/no/such/file' in e.output)
++ else:
++ raise
+
+ def test_cms_verify_token_scoped(self):
+ cms_content = cms.token_to_cms(client_fixtures.SIGNED_TOKEN_SCOPED)
++++++ 0001-Make-ROOTDIR-determination-more-robust.patch ++++++
>From 9a82a5ac543ea4af957602d171e1492e637133d2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <[email protected]>
Date: Fri, 27 Sep 2013 17:00:19 +0200
Subject: [PATCH] Make ROOTDIR determination more robust
This change is needed when keystone/ is a symlink and etc
is in a different directory hierarchy.
Change-Id: Ice9165ef25ec0200ccfb50c2f2f3121a136652a2
---
keystoneclient/tests/client_fixtures.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index:
python-keystoneclient-0.3.2.78.gbaa9490/keystoneclient/tests/client_fixtures.py
===================================================================
---
python-keystoneclient-0.3.2.78.gbaa9490.orig/keystoneclient/tests/client_fixtures.py
+++
python-keystoneclient-0.3.2.78.gbaa9490/keystoneclient/tests/client_fixtures.py
@@ -22,8 +22,8 @@ from keystoneclient.openstack.common imp
from keystoneclient import utils
-CLIENTDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-ROOTDIR = os.path.dirname(CLIENTDIR)
+ROOTDIR = os.path.normpath(os.path.join(
+ os.path.dirname(os.path.abspath(__file__)), "../.."))
CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
++++++ python-keystoneclient-master.tar.gz ++++++
++++ 17418 lines of diff (skipped)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
