Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: fix remaining references to monitor.MonitorError as iterable ......................................................................
py3: fix remaining references to monitor.MonitorError as iterable
Change-Id: Ic991c1a017f09431d4b38f58e529d0a6ec45a896 Signed-off-by: Dan Kenigsberg danken@redhat.com --- M init/wait_for_ipv4s M tests/network/nettestlib.py 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/64929/1
diff --git a/init/wait_for_ipv4s b/init/wait_for_ipv4s index c1e7f32..ab119de 100755 --- a/init/wait_for_ipv4s +++ b/init/wait_for_ipv4s @@ -51,7 +51,7 @@ if not ipless_devs: return except monitor.MonitorError as e: - if e[0] == monitor.E_TIMEOUT: + if e.args[0] == monitor.E_TIMEOUT: sys.stderr.write('IP addresses has not been caught within the ' 'given timeout.\n') else: diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index bf32ea3..a5fc461 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -464,7 +464,7 @@ return
except monitor.MonitorError as e: - if e[0] == monitor.E_TIMEOUT: + if e.args[0] == monitor.E_TIMEOUT: raise Exception( 'IPv6 addresses has not been caught within 20sec.\n' 'Event log: {}\n'.format(logevents))