From Dan Kenigsberg <dan...@redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net test: use static bonding defaults if dump fails
......................................................................
net test: use static bonding defaults if dump fails
sysfs_options_mapper.dump_bonding_options may fail during the test if
its target directory is missing. In such a case, take the shipped
defaults.
Change-Id: I33a6ecc14f6d1a2f7cc9da9bfaff4fad13fa8055
Signed-off-by: Dan Kenigsberg <dan...@redhat.com>
---
M tests/network/nettestlib.py
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/79889/1
diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py
index 7395755..79f55f4 100644
--- a/tests/network/nettestlib.py
+++ b/tests/network/nettestlib.py
@@ -532,13 +532,18 @@
bonding_name2num_fpath = ALTERNATIVE_BONDING_NAME2NUMERIC_PATH
if _has_sysfs_bond_permission():
- sysfs_options_mapper.dump_bonding_options()
+ try:
+ sysfs_options_mapper.dump_bonding_options()
+ except SystemError as e:
+ if e.errno != errno.ENOENT:
+ raise
if os.path.exists(BONDING_DEFAULTS):
bonding_defaults_fpath = BONDING_DEFAULTS
if os.path.exists(sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH):
- bonding_name2num_fpath = sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH
+ bonding_name2num_fpath = \
+ sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH
return bonding_defaults_fpath, bonding_name2num_fpath
--
To view, visit https://gerrit.ovirt.org/79889
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33a6ecc14f6d1a2f7cc9da9bfaff4fad13fa8055
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
