Saggi Mizrahi has uploaded a new change for review. Change subject: pep8 now also check visual aligment ......................................................................
pep8 now also check visual aligment Change-Id: Ia27f420e173eec667a8f81e8bdd13a4bd98bf200 Signed-off-by: Saggi Mizrahi <[email protected]> --- M tests/miscTests.py M tests/testrunner.py 2 files changed, 30 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/9038/1 diff --git a/tests/miscTests.py b/tests/miscTests.py index de33973..f9110b8 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -49,7 +49,7 @@ def watchCmd(cmd, stop, cwd=None, data=None, recoveryCallback=None): ret, out, err = misc.watchCmd(cmd, stop, cwd=cwd, data=data, - recoveryCallback=recoveryCallback) + recoveryCallback=recoveryCallback) return ret, out, err @@ -59,12 +59,12 @@ sleepProcs = [] for i in range(3): sleepProcs.append(misc.execCmd(["sleep", "3"], sync=False, - sudo=False)) + sudo=False)) pids = misc.pgrep("sleep") for proc in sleepProcs: self.assertTrue(proc.pid in pids, "pid %d was not located by pgrep" - % proc.pid) + % proc.pid) for proc in sleepProcs: proc.kill() @@ -246,7 +246,7 @@ Tests that the method fails correctly when given a non existing dir. """ self.assertRaises(OSError, misc.rotateFiles, "/I/DONT/EXIST", "prefix", - 2, persist=persist) + 2, persist=persist) def testEmptyDir(self, persist=False): """ @@ -493,7 +493,7 @@ #Copy self.assertRaises(misc.se.MiscBlockWriteException, ddWatchCopy, - srcPath, "/tmp/tmp", None, 100) + srcPath, "/tmp/tmp", None, 100) def testStop(self): """ @@ -587,21 +587,21 @@ Test that validator detects when a non HEX char is in the input. """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daz333") + "Dc08ff668-4072-4191-9fbb-f1c8f2daz333") def testInvalidInputInteger(self): """ Test that validator detects when an integer is in the input. """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - 23) + 23) def testInvalidInputUTF(self): """ Test that validator detects encoded utf-8 is in the input """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - u'\xe4\xbd\xa0\xe5\xa5\xbd') + u'\xe4\xbd\xa0\xe5\xa5\xbd') def testWrongLength(self): """ @@ -609,13 +609,13 @@ length """ self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daa33") + "Dc08ff668-4072-4191-9fbb-f1c8f2daa33") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fb-f1c8f2daa333") + "Dc08ff668-4072-4191-9fb-f1c8f2daa333") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff68-4072-4191-9fbb-f1c8f2daa333") + "Dc08ff68-4072-4191-9fbb-f1c8f2daa333") self.assertRaises(misc.se.InvalidParameterException, misc.validateUUID, - "Dc08ff668-4072-4191-9fbb-f1c8f2daa3313") + "Dc08ff668-4072-4191-9fbb-f1c8f2daa3313") class UuidPack(TestCaseBase): @@ -681,7 +681,7 @@ count = 802 with tempfile.NamedTemporaryFile() as f: cmd = [EXT_DD, "bs=1", "if=/dev/urandom", 'of=%s' % f.name, - 'count=%d' % count] + 'count=%d' % count] rc, out, err = misc.execCmd(cmd, sudo=False) self.assertTrue(misc.validateDDBytes(err, count)) @@ -693,7 +693,7 @@ count = 802 with tempfile.NamedTemporaryFile() as f: cmd = [EXT_DD, "bs=1", "if=/dev/urandom", 'of=%s' % f.name, - 'count=%d' % count] + 'count=%d' % count] rc, out, err = misc.execCmd(cmd, sudo=False) self.assertFalse(misc.validateDDBytes(err, count + 1)) @@ -703,9 +703,11 @@ Test that the method handles wired input. """ self.assertRaises(misc.se.InvalidParameterException, - misc.validateDDBytes, ["I AM", "PRETENDING TO", "BE DD"], "BE") + misc.validateDDBytes, + ["I AM", "PRETENDING TO", "BE DD"], "BE") self.assertRaises(misc.se.InvalidParameterException, - misc.validateDDBytes, ["I AM", "PRETENDING TO", "BE DD"], 32) + misc.validateDDBytes, + ["I AM", "PRETENDING TO", "BE DD"], 32) class ReadBlock(TestCaseBase): @@ -761,7 +763,7 @@ """ offset = 513 self.assertRaises(misc.se.MiscBlockReadException, misc.readblock, - "/dev/urandom", offset, 512) + "/dev/urandom", offset, 512) def testInvalidSize(self): """ @@ -769,7 +771,7 @@ """ size = 513 self.assertRaises(misc.se.MiscBlockReadException, misc.readblock, - "/dev/urandom", 512, size) + "/dev/urandom", 512, size) def testReadingMoreTheFileSize(self): """ @@ -786,7 +788,7 @@ path = self._createTempFile(offset + size - 100, writeData) self.assertRaises(misc.se.MiscBlockReadIncomplete, misc.readblock, - path, offset, size) + path, offset, size) os.unlink(path) @@ -950,7 +952,7 @@ # (C) Terry Pratchet - Small Gods code = "import sys; sys.stderr.write('%s')" % line ret, stdout, stderr = watchCmd([EXT_PYTHON, "-c", code], - lambda: False) + lambda: False) self.assertEquals(stderr[0], line) def testLeakFd(self): @@ -999,7 +1001,7 @@ # (C) Fox - The X Files code = "import sys; sys.stderr.write('%s')" % line ret, stdout, stderr = misc.execCmd([EXT_PYTHON, "-c", code], - sudo=False) + sudo=False) self.assertEquals(stderr[0], line) def testSudo(self): diff --git a/tests/testrunner.py b/tests/testrunner.py index cdbc9d3..51b5748 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -130,7 +130,7 @@ storage, label, isfail = self.errorClasses[SkipTest] storage.append((test, reason)) self._writeResult(test, 'SKIP : %s' % reason, TermColor.blue, 'S', - True) + True) def addError(self, test, err): stream = getattr(self, 'stream', None) @@ -197,10 +197,10 @@ testdir = os.path.dirname(os.path.abspath(__file__)) conf = config.Config(stream=stream, - env=os.environ, - verbosity=verbosity, - workingDir=testdir, - plugins=core.DefaultPluginManager()) + env=os.environ, + verbosity=verbosity, + workingDir=testdir, + plugins=core.DefaultPluginManager()) conf.plugins.addPlugin(SlowTestsPlugin()) runner = VdsmTestRunner(stream=conf.stream, @@ -242,8 +242,8 @@ if __name__ == '__main__': if "--help" in sys.argv: print("testrunner options:\n" - "--local-modules use vdsm modules from source tree, " - "instead of installed ones.\n") + "--local-modules use vdsm modules from source tree, " + "instead of installed ones.\n") if findRemove(sys.argv, "--local-modules"): hackVdsmModule() run() -- To view, visit http://gerrit.ovirt.org/9038 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia27f420e173eec667a8f81e8bdd13a4bd98bf200 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
