python/python-hvac
SHA256
15
0
Fork 0
forked from pool/python-hvac
Code Pull Requests Activity

Accepting request 992138 from devel:languages:python

Browse Source 
- Remove patch python-hvac-no-mock.patch
- Add patch remove-mock.patch, from upstream.
- Remove unneeded BuildRequires on mock

OBS-URL: https://build.opensuse.org/request/show/992138
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-hvac?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
2022-08-02 20:09:18 +00:00
committed by Git OBS Bridge
parent 14998f7b96 6e3f7a5981
commit f738edcd25
4 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
python-hvac-no-mock.patch
View File

@@ -1,37 +0,0 @@
Index: hvac-0.11.2/tests/unit_tests/api/secrets_engines/test_kv.py
===================================================================
--- hvac-0.11.2.orig/tests/unit_tests/api/secrets_engines/test_kv.py
+++ hvac-0.11.2/tests/unit_tests/api/secrets_engines/test_kv.py
@@ -1,6 +1,6 @@
from unittest import TestCase
-from mock import MagicMock
+from unittest.mock import MagicMock
from parameterized import parameterized
from hvac.api.secrets_engines.kv import Kv
Index: hvac-0.11.2/tests/unit_tests/api/test_vault_api_category.py
===================================================================
--- hvac-0.11.2.orig/tests/unit_tests/api/test_vault_api_category.py
+++ hvac-0.11.2/tests/unit_tests/api/test_vault_api_category.py
@@ -1,6 +1,6 @@
from unittest import TestCase
-from mock import create_autospec
+from unittest.mock import create_autospec
from hvac.adapters import Adapter
from hvac.api.vault_api_base import VaultApiBase
Index: hvac-0.11.2/tests/unit_tests/v1/test_aws_iam_methods.py
===================================================================
--- hvac-0.11.2.orig/tests/unit_tests/v1/test_aws_iam_methods.py
+++ hvac-0.11.2/tests/unit_tests/v1/test_aws_iam_methods.py
@@ -3,7 +3,7 @@ from base64 import b64decode
from datetime import datetime
from unittest import TestCase
-import mock
+from unittest import mock
from hvac import Client

7
python-hvac.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 2 05:50:10 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
- Remove patch python-hvac-no-mock.patch
- Add patch remove-mock.patch, from upstream.
- Remove unneeded BuildRequires on mock
-------------------------------------------------------------------
Mon May 2 17:28:37 UTC 2022 - pgajdos@suse.com

8
python-hvac.spec
View File

@@ -24,14 +24,13 @@ Summary: HashiCorp Vault API client
License: BSD-3-Clause
URL: https://github.com/ianunruh/hvac
Source: https://github.com/hvac/hvac/archive/v%{version}.tar.gz
# https://github.com/hvac/hvac/issues/582
Patch0: python-hvac-no-mock.patch
# PATCH-FIX-UPSTREAM Based on gh#hvac/hvac#23cd94654835134aa118805ecb4b7e5c538d04c1
Patch0: remove-mock.patch
BuildRequires: %{python_module Authlib}
BuildRequires: %{python_module Flask-SQLAlchemy}
BuildRequires: %{python_module Flask}
BuildRequires: %{python_module Werkzeug}
BuildRequires: %{python_module jwcrypto}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module parameterized}
BuildRequires: %{python_module pyhcl >= 0.3.10}
BuildRequires: %{python_module pytest}
@@ -51,8 +50,7 @@ BuildArch: noarch
HashiCorp Vault API client for Python 2/3
%prep
%setup -q -n hvac-%{version}
%patch0 -p1
%autosetup -p1 -n hvac-%{version}
# doctests and ldap need set up ldap server and that is quite an effort
rm -r tests/doctest/
rm tests/integration_tests/api/auth_methods/test_ldap.py

61
remove-mock.patch Normal file
View File

@@ -0,0 +1,61 @@
diff --git a/tests/unit_tests/api/secrets_engines/test_kv.py b/tests/unit_tests/api/secrets_engines/test_kv.py
index 49781669..599cb65e 100644
--- a/tests/unit_tests/api/secrets_engines/test_kv.py
+++ b/tests/unit_tests/api/secrets_engines/test_kv.py
@@ -1,6 +1,6 @@
from unittest import TestCase
-from mock import MagicMock
+from unittest.mock import MagicMock
from parameterized import parameterized
from hvac.api.secrets_engines.kv import Kv
diff --git a/tests/unit_tests/api/test_vault_api_category.py b/tests/unit_tests/api/test_vault_api_category.py
index 5945187b..1f67bcb7 100644
--- a/tests/unit_tests/api/test_vault_api_category.py
+++ b/tests/unit_tests/api/test_vault_api_category.py
@@ -1,6 +1,6 @@
from unittest import TestCase
-from mock import create_autospec
+from unittest.mock import create_autospec
from hvac.adapters import Adapter
from hvac.api.vault_api_base import VaultApiBase
diff --git a/tests/unit_tests/v1/test_aws_iam_methods.py b/tests/unit_tests/v1/test_aws_iam_methods.py
index bec913b1..b5f0f84f 100644
--- a/tests/unit_tests/v1/test_aws_iam_methods.py
+++ b/tests/unit_tests/v1/test_aws_iam_methods.py
@@ -3,7 +3,7 @@
from datetime import datetime
from unittest import TestCase
-import mock
+from unittest import mock
from hvac import Client
diff --git a/tests/utils/hvac_integration_test_case.py b/tests/utils/hvac_integration_test_case.py
index 6edaca18..d81ba091 100644
--- a/tests/utils/hvac_integration_test_case.py
+++ b/tests/utils/hvac_integration_test_case.py
@@ -1,17 +1,16 @@
#!/usr/bin/env python
-# -*- coding: utf-8 -*-
import logging
import re
import warnings
-from mock import patch
+from unittest.mock import patch
from tests.utils import get_config_file_path, create_client, is_enterprise
from tests.utils.server_manager import ServerManager
import distutils.spawn
-class HvacIntegrationTestCase(object):
+class HvacIntegrationTestCase:
"""Base class intended to be used by all hvac integration test cases."""
manager = None