Change in vdsm[master]: py3: fix remaining references to monitor.MonitorError as ite...

[Dan Kenigsberg]

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 
---
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))

gerrit-hooks has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE,         Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/64929/1/init/wait_for_ipv4s
File init/wait_for_ipv4s:

Line 50:                     ipless_devs.remove(dev_name)
Line 51:                 if not ipless_devs:
Line 52:                     return
Line 53:     except monitor.MonitorError as e:
Line 54:         if e.args[0] == monitor.E_TIMEOUT:
> Possibly nitpicking, but perhaps adding some property to MonitorError (a la

You are probably right, though I don't know if 'reason' fits a simple code or 'errno' (but errno is misleading).
Line 55:             sys.stderr.write('IP addresses has not been caught within the '
Line 56:                              'given timeout.\n')
Line 57:         else:
Line 58:             raise

Petr Horáček has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 1: Code-Review+1

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 1:

(1 comment)

https://gerrit.ovirt.org/#/c/64929/1/init/wait_for_ipv4s
File init/wait_for_ipv4s:

Line 50:                     ipless_devs.remove(dev_name)
Line 51:                 if not ipless_devs:
Line 52:                     return
Line 53:     except monitor.MonitorError as e:
Line 54:         if e.args[0] == monitor.E_TIMEOUT:
> You are probably right, though I don't know if 'reason' fits a simple code

With your permission, I suggest to postpone larger renaming, and take only this support as it is.
Line 55:             sys.stderr.write('IP addresses has not been caught within the '
Line 56:                              'given timeout.\n')
Line 57:         else:
Line 58:             raise

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 2: Verified+1

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: py3: fix remaining references to monitor.MonitorError as iterable
......................................................................

Patch Set 2: Code-Review+2

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has submitted this change and it was merged.

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 
---
M init/wait_for_ipv4s
M tests/network/nettestlib.py
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Petr Horáček: Looks good to me, but someone else must approve
  Dan Kenigsberg: Verified; Looks good to me, approved