Dan Kenigsberg has uploaded a new change for review. Change subject: make: unbreak pyflakes test ......................................................................
make: unbreak pyflakes test Much like pep8 which was fixed in https://gerrit.ovirt.org/44416 pyflakes test, too, was inadvertantly broken by https://gerrit.ovirt.org/43845. This patch reverts another bit of that message, while fixing some pyflakes damange accoumulated since its introduction. Change-Id: Iff48b8f1890b98711ae12a48680377ee22d9de63 Signed-off-by: Dan Kenigsberg <[email protected]> --- M Makefile.am M tests/functional/networkTests.py M tests/sdm_indirection_tests.py M tests/tcTests.py 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/45254/1 diff --git a/Makefile.am b/Makefile.am index 5633040..49f90d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,9 +116,10 @@ .PHONY: pyflakes pyflakes: python -c 'import pyflakes; print("pyflakes-%s" % pyflakes.__version__)' - find . -path './.git' -prune -type f -o \ - -name '*.py' -o -name '*.py.in' | \ - echo $(WHITELIST) | xargs $(PYFLAKES) | \ + ( find . -path './.git' -prune -type f -o \ + -path './vdsm_compat' -prune -type f -o \ + -name '*.py' -o -name '*.py.in' && \ + echo $(WHITELIST) ) | xargs $(PYFLAKES) | \ grep -w -v $(SKIP_PYFLAKES_ERR) | \ while read LINE; do echo "$$LINE"; false; done diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 056f3e9..6612034 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -31,8 +31,7 @@ from vdsm import ipwrapper from vdsm.ipwrapper import (routeExists, ruleExists, addrFlush, LinkType, getLinks, routeShowTable, linkDel, linkSet) -from vdsm.netconfpersistence import (KernelConfig, RunningConfig, - PersistentConfig) +from vdsm.netconfpersistence import (KernelConfig, RunningConfig) from vdsm.netinfo import (bridges, operstate, getRouteDeviceTo, _get_dhclient_ifaces, BONDING_SLAVES, BONDING_MASTERS, NET_CONF_PREF, OPERSTATE_UNKNOWN, diff --git a/tests/sdm_indirection_tests.py b/tests/sdm_indirection_tests.py index 09cc960..0184ac3 100644 --- a/tests/sdm_indirection_tests.py +++ b/tests/sdm_indirection_tests.py @@ -21,7 +21,7 @@ from testlib import permutations, expandPermutations from testlib import recorded -from storage import sd, blockSD, fileSD, glusterSD +from storage import sd, blockSD, fileSD class FakeDomainManifest(sd.StorageDomainManifest): diff --git a/tests/tcTests.py b/tests/tcTests.py index e84d96c..bee7439 100644 --- a/tests/tcTests.py +++ b/tests/tcTests.py @@ -30,7 +30,7 @@ from testlib import VdsmTestCase as TestCaseBase from testValidation import ValidateRunningAsRoot -from nettestlib import Bridge, Tap, requires_brctl, requires_tc +from nettestlib import Bridge, Tap, requires_tc from vdsm.constants import EXT_TC from network import tc -- To view, visit https://gerrit.ovirt.org/45254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff48b8f1890b98711ae12a48680377ee22d9de63 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
