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.

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

ci fixes #1170

Merged
merged 3 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define nox
pip install --upgrade pip;\
pip install nox;\
};\
nox $(1) -- '$(subst ",\",${noxconfig})';\
nox $(1) -- '${noxconfig}';\
}
endef

Expand Down
9 changes: 5 additions & 4 deletions tests/mocklib/keystoneclient/v3/tokens.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from unittest import mock


class TokenManager(mock.Mock):
class TokenManager:
validate = mock.Mock(name='validate')
validate.return_value = {'expires_at': '3022.07.04 00:00 CEST'}

def __init__(self, *argv, **kwarg):
super().__init__(*argv, **kwarg)
self.validate = mock.Mock(name='validate')
self.validate.return_value = {'expires_at': '3022.07.04 00:00 CEST'}
pass
8 changes: 4 additions & 4 deletions tests/test_linux/test_ipr/test_netns.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def test_get_netns_info(context):
target = veth.get_attr('IFLA_LINK_NETNSID')
for info in context.ipr.get_netns_info():
path = info.get_attr('NSINFO_PATH')
assert path.endswith(nsname)
netnsid = info['netnsid']
if target == netnsid:
break
if path.endswith(nsname):
netnsid = info['netnsid']
if target == netnsid:
break
else:
raise KeyError('peer netns not found')