Skip to content

Commit

Permalink
pinned earlier tenacity due to broken 8.4 (jd/tenacity#471)
Browse files Browse the repository at this point in the history
  • Loading branch information
PietroPasotti committed Jun 17, 2024
1 parent 3b5f651 commit 31377f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
7 changes: 2 additions & 5 deletions tests/integration/test_forward_auth.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.
import asyncio
import json
import logging
from os.path import join
Expand Down Expand Up @@ -81,15 +80,13 @@ async def test_deployment(ops_test: OpsTest, traefik_charm, forward_auth_tester_
stop=stop_after_attempt(20),
reraise=True,
)
def test_allowed_forward_auth_url_redirect(ops_test: OpsTest) -> None:
async def test_allowed_forward_auth_url_redirect(ops_test: OpsTest) -> None:
"""Test that a request hitting an application protected by IAP is forwarded by traefik to oathkeeper.
An allowed request should be performed without authentication.
Retry the request to ensure the access rules were populated by oathkeeper.
"""
requirer_url = asyncio.run(
get_reverse_proxy_app_url(ops_test, TRAEFIK_CHARM, IAP_REQUIRER_CHARM)
)
requirer_url = await get_reverse_proxy_app_url(ops_test, TRAEFIK_CHARM, IAP_REQUIRER_CHARM)

protected_url = join(requirer_url, "anything/allowed")

Expand Down
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@ commands =
[testenv:integration]
description = Run integration tests
deps =
# pinned for https://github.com/charmed-kubernetes/pytest-operator/issues/131
pytest==8.1.1

# fix for https://github.com/pytest-dev/pytest-asyncio/releases/tag/v0.23.0 making pytest-operator b0rk
pytest-asyncio==0.21.0
pytest==8.2.2
pytest-asyncio==0.21.2
pytest-operator
juju
tenacity
# fix for https://github.com/jd/tenacity/issues/471
tenacity==8.3.0
sh
-r{toxinidir}/requirements.txt
commands =
Expand Down

0 comments on commit 31377f0

Please sign in to comment.