Skip to content

Commit

Permalink
Tests: pin boto3
Browse files Browse the repository at this point in the history
For boto/boto3#4398

Also lint updates

Signed-off-by: Peter Sabaini <[email protected]>
Change-Id: Ieb248434b482f513060ca8b453e2068d51fde9cf
  • Loading branch information
sabaini committed Jan 23, 2025
1 parent 1991eb7 commit 41d4c74
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions hooks/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,10 @@ def check_optional_config_and_relations(configs):
"resolve."
if (len(zonegroups) > 1 and
config('zonegroup') not in zonegroups):
return('blocked', status_msg)
return ('blocked', status_msg)

if len(zones) > 1 and config('zone') not in zones:
return('blocked', status_msg)
return ('blocked', status_msg)

if not all(master_configured):
return ('blocked', "Failure in Multisite migration, "
Expand Down
3 changes: 3 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ git+https://opendev.org/openstack/tempest.git#egg=tempest

croniter # needed for charm-rabbitmq-server unit tests
psutil

# https://github.com/boto/boto3/issues/4392
boto3<1.36.0
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ deps =
basepython = python3
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
flake8==3.9.2
flake8
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} hooks unit_tests tests actions lib files
charm-proof
Expand Down

0 comments on commit 41d4c74

Please sign in to comment.