|
|
2b8ed0 |
From fddcbec3d7b5ad50ffd2e66c7203dc200d26a594 Mon Sep 17 00:00:00 2001
|
|
|
2b8ed0 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
2b8ed0 |
Date: Mon, 28 Mar 2016 22:07:08 -0400
|
|
|
2b8ed0 |
Subject: [PATCH 3/3] Force overwrite on cred_store tests
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
Certain versions of krb5 (>= 1.14 or anything that backported the
|
|
|
2b8ed0 |
patch, including RHEL/Centos/Fedora) object (probably rightly so) to
|
|
|
2b8ed0 |
duplicate credentials already existing in the ccache. Tell those
|
|
|
2b8ed0 |
versions to sit down and shut up.
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
This is the third and final commit in a series to enable running our
|
|
|
2b8ed0 |
test suite on RHEL-7.
|
|
|
2b8ed0 |
---
|
|
|
2b8ed0 |
gssapi/tests/test_high_level.py | 3 ++-
|
|
|
2b8ed0 |
gssapi/tests/test_raw.py | 2 +-
|
|
|
2b8ed0 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
diff --git a/gssapi/tests/test_high_level.py b/gssapi/tests/test_high_level.py
|
|
|
2b8ed0 |
index 404ed43..3a9b8a3 100644
|
|
|
2b8ed0 |
--- a/gssapi/tests/test_high_level.py
|
|
|
2b8ed0 |
+++ b/gssapi/tests/test_high_level.py
|
|
|
2b8ed0 |
@@ -174,7 +174,8 @@ class CredsTestCase(_GSSAPIKerberosTestCase):
|
|
|
2b8ed0 |
deleg_creds = server_ctx.delegated_creds
|
|
|
2b8ed0 |
deleg_creds.shouldnt_be_none()
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
- store_res = deleg_creds.store(usage='initiate', set_default=True)
|
|
|
2b8ed0 |
+ store_res = deleg_creds.store(usage='initiate', set_default=True,
|
|
|
2b8ed0 |
+ overwrite=True)
|
|
|
2b8ed0 |
store_res.usage.should_be('initiate')
|
|
|
2b8ed0 |
store_res.mechs.should_include(gb.MechType.kerberos)
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
diff --git a/gssapi/tests/test_raw.py b/gssapi/tests/test_raw.py
|
|
|
2b8ed0 |
index 23f2e2c..beebfb3 100644
|
|
|
2b8ed0 |
--- a/gssapi/tests/test_raw.py
|
|
|
2b8ed0 |
+++ b/gssapi/tests/test_raw.py
|
|
|
2b8ed0 |
@@ -474,7 +474,7 @@ class TestBaseUtilities(_GSSAPIKerberosTestCase):
|
|
|
2b8ed0 |
deleg_creds = server_ctx_resp.delegated_creds
|
|
|
2b8ed0 |
deleg_creds.shouldnt_be_none()
|
|
|
2b8ed0 |
store_res = gb.store_cred(deleg_creds, usage='initiate',
|
|
|
2b8ed0 |
- set_default=True)
|
|
|
2b8ed0 |
+ set_default=True, overwrite=True)
|
|
|
2b8ed0 |
|
|
|
2b8ed0 |
store_res.shouldnt_be_none()
|
|
|
2b8ed0 |
store_res.usage.should_be('initiate')
|
|
|
2b8ed0 |
--
|
|
|
2b8ed0 |
1.8.3.1
|
|
|
2b8ed0 |
|