Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[automation]

gerrit-hooks has posted comments on this change.

Change subject: tests: fix testGetBondingOptions
..


Patch Set 2:

* #1374328::Update tracker: OK
* Set MODIFIED::bug 1374328#1374328IGNORE, not all related patches are 
closed, check 63486

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

Gerrit-MessageType: comment
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: tests: fix testGetBondingOptions
..


tests: fix testGetBondingOptions

Bonding options are reported only if they differ from defaults.
Bond 'mode' is exceptional, it is reported always. We are not
interested in this one as it may differ from machine to machine.

With this path we introduce new helper method which hides 'mode'
option.

Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/63424
Continuous-Integration: Jenkins CI
Reviewed-by: Edward Haas 
Reviewed-by: Dan Kenigsberg 
Bug-Url: https://bugzilla.redhat.com/1374328
Reviewed-on: https://gerrit.ovirt.org/63541
---
M tests/network/netinfo_test.py
1 file changed, 11 insertions(+), 4 deletions(-)

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



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

Gerrit-MessageType: merged
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[edwardh]

Edward Haas has posted comments on this change.

Change subject: tests: fix testGetBondingOptions
..


Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[phoracek]

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

Change subject: tests: fix testGetBondingOptions
..


Patch Set 1: Verified+1

Test was fixed and now it passes OK.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: tests: fix testGetBondingOptions
..


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[automation]

gerrit-hooks has posted comments on this change.

Change subject: tests: fix testGetBondingOptions
..


Patch Set 1:

* #1374328::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1374328::OK, public bug
* Check Product::#1374328::OK, Correct classification oVirt
* Check TM::#1374328::ERROR, wrong target milestone for stable branch, --- 
should match ^.*4.0.*
* Check merged to previous::OK, change not open on any previous branch

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

Gerrit-MessageType: comment
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[ovirt-4.0]: tests: fix testGetBondingOptions

[phoracek]

Hello Dan Kenigsberg, Edward Haas,

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

https://gerrit.ovirt.org/63541

to review the following change.

Change subject: tests: fix testGetBondingOptions
..

tests: fix testGetBondingOptions

Bonding options are reported only if they differ from defaults.
Bond 'mode' is exceptional, it is reported always. We are not
interested in this one as it may differ from machine to machine.

With this path we introduce new helper method which hides 'mode'
option.

Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/63424
Continuous-Integration: Jenkins CI
Reviewed-by: Edward Haas 
Reviewed-by: Dan Kenigsberg 
Bug-Url: https://bugzilla.redhat.com/1374328
---
M tests/network/netinfo_test.py
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/63541/1

diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py
index a09510d..50de902 100644
--- a/tests/network/netinfo_test.py
+++ b/tests/network/netinfo_test.py
@@ -250,20 +250,27 @@
 
 try:  # no error is anticipated but let's make sure we can clean up
 self.assertEqual(
-bonding._getBondingOptions(bondName), {}, "This test fails"
-" when a new bonding option is added to the kernel. Please"
-" run vdsm-tool dump-bonding-options` and retest.")
+self._bond_opts_without_mode(bondName), {},
+'This test fails when a new bonding option is added to '
+'the kernel. Please run vdsm-tool dump-bonding-options` '
+'and retest.')
 
 with open(bonding.BONDING_OPT % (bondName, 'miimon'),
   'w') as opt:
 opt.write(INTERVAL)
 
-self.assertEqual(bonding._getBondingOptions(bondName),
+self.assertEqual(self._bond_opts_without_mode(bondName),
  {'miimon': INTERVAL})
 
 finally:
 bonds.write('-' + bondName)
 
+@staticmethod
+def _bond_opts_without_mode(bond_name):
+opts = bonding._getBondingOptions(bond_name)
+opts.pop('mode')
+return opts
+
 def test_get_bonding_option_numeric_val_exists(self):
 mode_num = bonding.BONDING_MODES_NAME_TO_NUMBER["balance-rr"]
 self.assertNotEqual(bonding.get_bonding_option_numeric_val(


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If60c2e4fadf470e2325eb6014a6ddf051499b3ee
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.0
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org