Skip to content

Commit

Permalink
Merge pull request #1170 from svinota/ci-fixes
Browse files Browse the repository at this point in the history
ci fixes

Bug-Url: #1170
  • Loading branch information
svinota authored Feb 9, 2024
2 parents c903283 + 1279013 commit 6e6e374
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
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')

0 comments on commit 6e6e374

Please sign in to comment.