Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pytest from 7.4.4 to 8.0.0 #1637

Merged
merged 3 commits into from
Feb 9, 2024
Merged

Bump pytest from 7.4.4 to 8.0.0 #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33b13ef
Bump pytest from 7.4.4 to 8.0.0
dependabot[bot] Feb 8, 2024
25c3a0e
See if this fixes things
jonathangreen Feb 9, 2024
d9549b9
Fix test
jonathangreen Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 31 additions & 30 deletions tests/api/admin/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,33 @@
from unittest.mock import MagicMock, patch

import pytest
from _pytest.monkeypatch import MonkeyPatch
from requests import RequestException

from api.admin.config import Configuration as AdminConfig
from api.admin.config import OperationalMode


class TestAdminUI:
@staticmethod
def _set_env(monkeypatch, key: str, value: str | None):
class MonkeyPatchEnvFixture:
def __init__(self, monkeypatch: MonkeyPatch):
self.monkeypatch = monkeypatch

def __call__(self, key: str, value: str | None) -> None:
if value:
monkeypatch.setenv(key, value)
self.monkeypatch.setenv(key, value)
elif key in os.environ:
monkeypatch.delenv(key)
self.monkeypatch.delenv(key)


@pytest.fixture
def monkeypatch_env(monkeypatch: MonkeyPatch) -> MonkeyPatchEnvFixture:
return MonkeyPatchEnvFixture(monkeypatch)


def test_package_version_cached(self, monkeypatch):
with patch(
"api.admin.config.Configuration.env_package_version"
) as env_package_version:
class TestAdminUI:
def test_package_version_cached(self):
with patch.object(AdminConfig, "env_package_version") as env_package_version:
AdminConfig._version = None
env_package_version.return_value = None

# The first call to package_version() should call env_package_version()
Expand All @@ -45,18 +54,16 @@ def test_package_version_cached(self, monkeypatch):
)
def test_env_package_version(
self,
monkeypatch,
monkeypatch_env: MonkeyPatchEnvFixture,
package_version: str | None,
resolves: bool,
expected_result: str | None,
):
with patch(
"api.admin.config.Configuration.resolve_package_version"
with patch.object(
AdminConfig, "resolve_package_version"
) as resolve_package_version:
resolve_package_version.return_value = "x.x.x"
self._set_env(
monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version
)
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version)
assert AdminConfig.env_package_version() == expected_result
assert resolve_package_version.call_count == (1 if resolves else 0)

Expand Down Expand Up @@ -110,16 +117,14 @@ def test_resolve_package_version(self, caplog):
)
def test_package_url(
self,
monkeypatch,
monkeypatch_env: MonkeyPatchEnvFixture,
package_name: str | None,
package_version: str | None,
mode: OperationalMode,
expected_result_startswith: str,
):
self._set_env(monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_NAME", package_name)
self._set_env(
monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version
)
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_NAME", package_name)
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version)
result = AdminConfig.package_url(_operational_mode=mode)
assert result.startswith(expected_result_startswith)
# Reset the cached version
Expand All @@ -143,15 +148,13 @@ def test_package_url(
)
def test_package_development_directory(
self,
monkeypatch,
monkeypatch_env: MonkeyPatchEnvFixture,
package_name: str | None,
package_version: str | None,
expected_result: str,
):
self._set_env(monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_NAME", package_name)
self._set_env(
monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version
)
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_NAME", package_name)
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", package_version)
result = AdminConfig.package_development_directory(_base_dir="/my-base-dir")
assert result == expected_result

Expand Down Expand Up @@ -192,15 +195,13 @@ def test_package_development_directory(
)
def test_lookup_asset_url(
self,
monkeypatch,
monkeypatch_env: MonkeyPatchEnvFixture,
asset_key: str,
operational_mode: OperationalMode,
expected_result: str,
):
self._set_env(
monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_NAME", "known-package-name"
)
self._set_env(monkeypatch, "TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", "1.0.0")
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_NAME", "known-package-name")
monkeypatch_env("TPP_CIRCULATION_ADMIN_PACKAGE_VERSION", "1.0.0")
result = AdminConfig.lookup_asset_url(
key=asset_key, _operational_mode=operational_mode
)
Expand Down