LGTM. Thanks, Jose
On Fri, Sep 27, 2013 at 10:44:49AM +0000, Michele Tartara wrote: > Newer versions of pylint are more strict regarding indentation rules. This > commit fixes a couple of indentations that they consider wrong. > > Signed-off-by: Michele Tartara <[email protected]> > --- > qa/qa_cluster.py | 62 > ++++++++++++------------- > test/py/cmdlib/testsupport/cmdlib_testcase.py | 2 +- > 2 files changed, 32 insertions(+), 32 deletions(-) > > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index 6c5a21d..0f3e73a 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -616,37 +616,37 @@ def > _TestClusterModifyDiskTemplatesDrbdHelper(enabled_disk_templates): > > drbd_usermode_helper = qa_config.get("drbd-usermode-helper", "/bin/true") > bogus_usermode_helper = "/tmp/pinkbunny" > - for command, fail in \ > - [(["gnt-cluster", "modify", > - "--enabled-disk-templates=%s" % constants.DT_DRBD8, > - "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=%s" % drbd_usermode_helper], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=%s" % bogus_usermode_helper], True), > - # unsetting helper when DRBD is enabled should not work > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper="], True), > - (["gnt-cluster", "modify", > - "--enabled-disk-templates=%s" % constants.DT_PLAIN, > - "--ipolicy-disk-templates=%s" % constants.DT_PLAIN], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper="], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=%s" % drbd_usermode_helper], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=%s" % drbd_usermode_helper, > - "--enabled-disk-templates=%s" % constants.DT_DRBD8, > - "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=", > - "--enabled-disk-templates=%s" % constants.DT_PLAIN, > - "--ipolicy-disk-templates=%s" % constants.DT_PLAIN], False), > - (["gnt-cluster", "modify", > - "--drbd-usermode-helper=%s" % drbd_usermode_helper, > - "--enabled-disk-templates=%s" % constants.DT_DRBD8, > - "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > - ]: > + for command, fail in [ > + (["gnt-cluster", "modify", > + "--enabled-disk-templates=%s" % constants.DT_DRBD8, > + "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=%s" % drbd_usermode_helper], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=%s" % bogus_usermode_helper], True), > + # unsetting helper when DRBD is enabled should not work > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper="], True), > + (["gnt-cluster", "modify", > + "--enabled-disk-templates=%s" % constants.DT_PLAIN, > + "--ipolicy-disk-templates=%s" % constants.DT_PLAIN], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper="], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=%s" % drbd_usermode_helper], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=%s" % drbd_usermode_helper, > + "--enabled-disk-templates=%s" % constants.DT_DRBD8, > + "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=", > + "--enabled-disk-templates=%s" % constants.DT_PLAIN, > + "--ipolicy-disk-templates=%s" % constants.DT_PLAIN], False), > + (["gnt-cluster", "modify", > + "--drbd-usermode-helper=%s" % drbd_usermode_helper, > + "--enabled-disk-templates=%s" % constants.DT_DRBD8, > + "--ipolicy-disk-templates=%s" % constants.DT_DRBD8], False), > + ]: > AssertCommand(command, fail=fail) > _RestoreEnabledDiskTemplates() > > diff --git a/test/py/cmdlib/testsupport/cmdlib_testcase.py > b/test/py/cmdlib/testsupport/cmdlib_testcase.py > index 52fcc06..5c91f73 100644 > --- a/test/py/cmdlib/testsupport/cmdlib_testcase.py > +++ b/test/py/cmdlib/testsupport/cmdlib_testcase.py > @@ -115,7 +115,7 @@ class CmdlibTestCase(testutils.GanetiTestCase): > doc="Default OS") > os_name_variant = property( > fget=lambda self: self.os.name + objects.OS.VARIANT_DELIM + > - self.os.supported_variants[0], > + self.os.supported_variants[0], > doc="OS name and variant string") > > def setUp(self): > -- > 1.7.10.4 > -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
