Change in vdsm[master]: net test: Cleanup _fakeTypeDetection

Edward Haas has uploaded a new change for review.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................

net test: Cleanup _fakeTypeDetection

Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Signed-off-by: Edward Haas <edwardh(a)redhat.com&gt;
---
M tests/network/ipwrapper_test.py
M tests/network/netinfo_test.py
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/61362/1

diff --git a/tests/network/ipwrapper_test.py b/tests/network/ipwrapper_test.py
index 5b08df9..3d9992a 100644
--- a/tests/network/ipwrapper_test.py
+++ b/tests/network/ipwrapper_test.py
@@ -33,10 +33,6 @@
 from testlib import VdsmTestCase as TestCaseBase
 
 
-def _fakeTypeDetection(cls, devname):
-    pass
-
-
 @attr(type='unit')
 class TestIpwrapper(TestCaseBase):
     def testRouteFromText(self):
diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py
index 014073d..3965e90 100644
--- a/tests/network/netinfo_test.py
+++ b/tests/network/netinfo_test.py
@@ -20,7 +20,6 @@
 #
 from __future__ import absolute_import
 import os
-from functools import partial
 import io
 
 from nose.plugins.attrib import attr
@@ -32,7 +31,6 @@
 from vdsm.utils import random_iface_name
 from vdsm import sysctl
 
-from .ipwrapper_test import _fakeTypeDetection
 from modprobe import RequireBondingMod
 from .nettestlib import dnsmasq_run, dummy_device, veth_pair, wait_for_ipv6
 from testlib import mock
@@ -145,8 +143,7 @@
     @mock.patch.object(ipwrapper.Link, '_hiddenNics', ['hid*'])
     @mock.patch.object(ipwrapper.Link, '_hiddenBonds', ['jb*'])
     @mock.patch.object(ipwrapper.Link, '_fakeNics', ['fake*'])
-    @mock.patch.object(ipwrapper.Link, '_detectType',
-                       partial(_fakeTypeDetection, ipwrapper.Link))
+    @mock.patch.object(ipwrapper.Link, '_detectType', lambda x: None)
     @mock.patch.object(ipwrapper, '_bondExists', lambda x: x == 'jbond')
     @mock.patch.object(misc, 'getLinks')
     def testNics(self, mock_getLinks):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;

gerrit-hooks has posted comments on this change.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


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

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

Edward Haas has posted comments on this change.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


Patch Set 1: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

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

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


Patch Set 1: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

gerrit-hooks has posted comments on this change.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


Patch Set 2:

* 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'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


net test: Cleanup _fakeTypeDetection

Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Signed-off-by: Edward Haas <edwardh(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/61362
Reviewed-by: Petr Horáček <phoracek(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Continuous-Integration: Jenkins CI
---
M tests/network/ipwrapper_test.py
M tests/network/netinfo_test.py
2 files changed, 1 insertion(+), 8 deletions(-)

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



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;

gerrit-hooks has posted comments on this change.

Change subject: net test: Cleanup _fakeTypeDetection
......................................................................


Patch Set 3:

* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I43a456051f9ad4d50fa4ebaff584bc2828980608
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No