Change in vdsm[master]: net: tests: only test kernel config if unified persistence

ibarkan at redhat.com ibarkan at redhat.com
Mon Jul 13 09:14:06 UTC 2015


Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/43499

to review the following change.

Change subject: net: tests: only test kernel config if unified persistence
......................................................................

net: tests: only test kernel config if unified persistence

Testing KernelConfig does not support ifcfg persistence.

Change-Id: If7c360deea32f4514919eabee2284c34667b4a4e
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1203422
Reviewed-on: https://gerrit.ovirt.org/42964
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
Continuous-Integration: Dan Kenigsberg <danken at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/43499/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index f980feb..6ccd114 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -359,7 +359,9 @@
     def setupNetworks(self, *args, **kwargs):
         test_kernel_config = kwargs.pop('test_kernel_config', True)
         status, msg = self.vdsm_net.setupNetworks(*args, **kwargs)
-        if test_kernel_config:
+        unified = (
+            vdsm.config.config.get('vars', 'net_persistence') == 'unified')
+        if unified and test_kernel_config:
             self._assert_kernel_config_matches_running_config()
         return status, msg
 


-- 
To view, visit https://gerrit.ovirt.org/43499
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7c360deea32f4514919eabee2284c34667b4a4e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list