Change in vdsm[ovirt-3.6]: make: unbreak pyflakes test

danken at redhat.com danken at redhat.com
Tue Aug 25 11:37:18 UTC 2015


Hello Piotr Kliczewski,

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

    https://gerrit.ovirt.org/45297

to review the following change.

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.

Backport-To: 3.6
Change-Id: Iff48b8f1890b98711ae12a48680377ee22d9de63
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/45254
Continuous-Integration: Jenkins CI
Reviewed-by: Yeela Kaplan <ykaplan at redhat.com>
Reviewed-by: Piotr Kliczewski <piotr.kliczewski at gmail.com>
---
M Makefile.am
M tests/tcTests.py
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/45297/1

diff --git a/Makefile.am b/Makefile.am
index 5633040..5508094 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,9 +116,9 @@
 .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 \
+		-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/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/45297
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff48b8f1890b98711ae12a48680377ee22d9de63
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski at gmail.com>


More information about the vdsm-patches mailing list