- From f3edc9154ae2bf10eb9a8da85b497440b5dc02c8 Mon Sep 17 00:00:00 2001

- From: Adam Miller <maxamillion@fedoraproject.org>

- Date: Fri, 6 Oct 2017 14:08:15 -0500

- Subject: [PATCH] Ensure krb principal/keytab are str type in koji_util

- 

- Thanks to @puiterwijk for the patch

- 

- Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

- ---

-  atomic_reactor/koji_util.py | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/atomic_reactor/koji_util.py b/atomic_reactor/koji_util.py

- index ce3bc5e9..e0adf98d 100644

- --- a/atomic_reactor/koji_util.py

- +++ b/atomic_reactor/koji_util.py

- @@ -75,8 +75,8 @@ def koji_login(session,

-          # Use Kerberos

-          logger.info("Using Kerberos for Koji authentication")

-          if krb_principal and krb_keytab:

- -            kwargs['principal'] = krb_principal

- -            kwargs['keytab'] = krb_keytab

- +            kwargs['principal'] = str(krb_principal)

- +            kwargs['keytab'] = str(krb_keytab)

-  

-          result = session.krb_login(**kwargs)

-  

- From 5f93a9ef66f0c343c3b4adaa4fc1d478e7b957dc Mon Sep 17 00:00:00 2001

- From: Vadim Rutkovsky <vrutkovs@redhat.com>

- Date: Wed, 8 Nov 2017 12:17:52 +0100

- Subject: [PATCH] tests: flexmock requests.Sessions functions instead of

-  requests module functions

- 

- This fixes tests on Fedora, as these are running with networking

- disabled and were incorrectly mocked

- ---

-  tests/plugins/test_add_yum_repo_by_url.py | 2 +-

-  tests/plugins/test_yum_inject.py          | 2 +-

-  2 files changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/tests/plugins/test_add_yum_repo_by_url.py b/tests/plugins/test_add_yum_repo_by_url.py

- index 24e9686..6f57182 100644

- --- a/tests/plugins/test_add_yum_repo_by_url.py

- +++ b/tests/plugins/test_add_yum_repo_by_url.py

- @@ -47,7 +47,7 @@ def prepare():

-      (flexmock(requests.Response, content=repocontent)

-          .should_receive('raise_for_status')

-          .and_return(None))

- -    (flexmock(requests, get=lambda *_: requests.Response()))

- +    (flexmock(requests.Session, get=lambda *_: requests.Response()))

-      mock_get_retry_session()

-  

-      return tasker, workflow

- diff --git a/tests/plugins/test_yum_inject.py b/tests/plugins/test_yum_inject.py

- index eb6e413..730245b 100644

- --- a/tests/plugins/test_yum_inject.py

- +++ b/tests/plugins/test_yum_inject.py

- @@ -56,7 +56,7 @@ def prepare(df_path, inherited_user=''):

-      (flexmock(requests.Response, content=repocontent)

-       .should_receive('raise_for_status')

-       .and_return(None))

- -    (flexmock(requests, get=lambda *_: requests.Response()))

- +    (flexmock(requests.Session, get=lambda *_: requests.Response()))

-      return tasker, workflow

-  

-  

- -- 

- 2.14.3

- 

- From 466db30d395024f6bf5bb61c39308555c85ce1cf Mon Sep 17 00:00:00 2001

- From: Vadim Rutkovsky <vrutkovs@redhat.com>

- Date: Wed, 8 Nov 2017 14:34:36 +0100

- Subject: [PATCH] tests: skip tests if dockpulp has no imgutils module

- 

- ---

-  tests/plugins/test_pulp_tag.py | 6 +++---

-  1 file changed, 3 insertions(+), 3 deletions(-)

- 

- diff --git a/tests/plugins/test_pulp_tag.py b/tests/plugins/test_pulp_tag.py

- index 65ae6bc..1b211c3 100644

- --- a/tests/plugins/test_pulp_tag.py

- +++ b/tests/plugins/test_pulp_tag.py

- @@ -150,7 +150,7 @@ def prepare(v1_image_ids={}):

-      return tasker, workflow

-  

-  

- -@pytest.mark.skipif(dockpulp is None,

- +@pytest.mark.skipif(dockpulp is None or not hasattr(dockpulp, "imgutils"),

-                      reason='dockpulp module not available')

-  @pytest.mark.parametrize(("v1_image_ids", "should_raise"), [

-      ({'x86_64': None, 'ppc64le': None}, False),

- @@ -194,7 +194,7 @@ def test_pulp_tag_basic(tmpdir, monkeypatch, v1_image_ids, should_raise, caplog)

-      assert results['pulp_tag'] == expected_results

-  

-  

- -@pytest.mark.skipif(dockpulp is None,

- +@pytest.mark.skipif(dockpulp is None or not hasattr(dockpulp, "imgutils"),

-                      reason='dockpulp module not available')

-  def test_pulp_tag_source_secret(tmpdir, monkeypatch, caplog):

-      v1_image_ids = {'x86_64': None,

- @@ -222,7 +222,7 @@ def test_pulp_tag_source_secret(tmpdir, monkeypatch, caplog):

-      assert results['pulp_tag'] == expected_results

-  

-  

- -@pytest.mark.skipif(dockpulp is None,

- +@pytest.mark.skipif(dockpulp is None or not hasattr(dockpulp, "imgutils"),

-                      reason='dockpulp module not available')

-  def test_pulp_tag_service_account_secret(tmpdir, monkeypatch, caplog):

-      v1_image_ids = {'x86_64': None,

- -- 

- 2.14.3

- 

- %global commit 3ea098ef730d18b7b533f1043f58f07bfd9f58ea

- Version:        1.6.28

- # Need to fix the unicode vs string handling of some krb values passed in

- #

- # Submitted upstream

- #

- #   https://github.com/projectatomic/atomic-reactor/pull/860

- Patch1:         atomic-reactor-koji-util-krb-str.patch

- 

- # Several tests incorrectly mock requests and fail with no network access

- #

- # Submitted upstream

- #

- #   https://github.com/projectatomic/atomic-reactor/pull/878

- Patch2:         atomic-reactor-mock-requests-session.patch

- 

- #Mocked dockpulp seems to sneak in some tests and these tests fail as

- # the mocked copy don't have imgutils module

- # Submitted upstream: https://github.com/projectatomic/atomic-reactor/pull/879

- 

- Patch3:         atomic-reactor-skip-tests-for-mocked-dockpulp.patch

- 

- 

- BuildConflicts:  python2-osbs-client < 0.44

- BuildConflicts:  python3-osbs-client < 0.44

- %patch1 -p1

- %patch2 -p1

- %patch3 -p1

- * Wed Nov 8 2017 Vadim Rutkovsky <vrutkovs@fedoraproject.org> - 1.6.27-1

- SHA512 (atomic-reactor-3ea098ef730d18b7b533f1043f58f07bfd9f58ea.tar.gz) = 711290bcfb01ad1f81af858f4f0a437db691411371375eeebcd11b432ceb168ff1630ccd313a22f22984c54114b4380b568cda46f3700cea6ca84f79e8a2e198