Re: [Autotest] [KVM-AUTOTEST PATCH 1/4] kvm test: Fix more incorrect long line breaks lying around.

[Lucas Meneghel Rodrigues <lmr@redhat.com>]

On Sat, 2009-06-13 at 05:00 -0400, Michael Goldish wrote:
> ----- "Lucas Meneghel Rodrigues" <lmr@redhat.com> wrote:
> 
> > Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
> > ---
> >  client/tests/kvm/kvm_config.py |   14 +++++++-------
> >  client/tests/kvm/kvm_tests.py  |   12 ++++++------
> >  2 files changed, 13 insertions(+), 13 deletions(-)
> > 
> > diff --git a/client/tests/kvm/kvm_config.py
> > b/client/tests/kvm/kvm_config.py
> > index 95eefcb..343c67d 100755
> > --- a/client/tests/kvm/kvm_config.py
> > +++ b/client/tests/kvm/kvm_config.py
> > @@ -302,9 +302,9 @@ class config:
> >              # Found an operator?
> >              if op_found:
> >                  if self.debug and not restricted:
> > -                    self.__debug_print(indented_line,
> > -                                     "Parsing operator (%d dicts in current "
> > -                                     "context)" % len_list)
> > +                    self.__debug_print(indented_line, ("Parsing operator "
>                                                          ^
> I don't think we need the parentheses opened here        |
> because the parameters are already enclosed in parentheses.

Ooops, you are right, I am going to apply the patch minus these two
changes. Thanks!

> 
> > +                                                       "(%d dicts in current "
> > +                                                       "context)" % len_list))
> >                  (left, value) = self.split_and_strip(line, op_found)
> >                  filters_and_key = self.split_and_strip(left, ":")
> >                  filters = filters_and_key[:-1]
> > @@ -349,10 +349,10 @@ class config:
> >                                  break
> >                  list = filtered_list
> >                  if self.debug and not restricted:
> > -                    self.__debug_print(indented_line,
> > -                                     "Parsing no/only (%d dicts in current "
> > -                                     "context, %d remain)" %
> > -                                     (len_list, len(list)))
> > +                    self.__debug_print(indented_line, ("Parsing no/only "
>                                                          ^
> I don't think we need the parentheses opened here        |
> 
> > +                                                       "(%d dicts in current "
> > +                                                       "context, %d remain)" %
> > +                                                       (len_list, len(list))))
> >  
> >              # Parse 'variants'
> >              elif line == "variants:":
> > diff --git a/client/tests/kvm/kvm_tests.py
> > b/client/tests/kvm/kvm_tests.py
> > index 54d2a7a..4b87a76 100644
> > --- a/client/tests/kvm/kvm_tests.py
> > +++ b/client/tests/kvm/kvm_tests.py
> > @@ -327,16 +327,16 @@ def run_autotest(test, params, env):
> >          logging.info(str(result))
> >          if result[1] == "FAIL":
> >              status_fail = True
> > -            message_fail = "Test '%s' ended with FAIL"
> > -            " (info: '%s')" % (result[0], result[3])
> > +            message_fail = ("Test '%s' ended with FAIL "
> > +                            "(info: '%s')" % (result[0], result[3]))
> >          if result[1] == "ERROR":
> >              status_error = True
> > -            message_error = "Test '%s' ended with ERROR"
> > -            " (info: '%s')" % (result[0], result[3])
> > +            message_error = ("Test '%s' ended with ERROR "
> > +                             "(info: '%s')" % (result[0], result[3]))
> >          if result[1] == "ABORT":
> >              status_error = True
> > -            message_error = "Test '%s' ended with ABORT"
> > -            " (info: '%s')" % (result[0], result[3])
> > +            message_error = ("Test '%s' ended with ABORT "
> > +                             "(info: '%s')" % (result[0], result[3]))
> >  
> >      # Copy test results to the local bindir/guest_results
> >      logging.info("Copying results back from guest...")
> > -- 
> > 1.6.2.2
> > 
> > _______________________________________________
> > Autotest mailing list
> > Autotest@test.kernel.org
> > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
-- 
Lucas Meneghel Rodrigues
Software Engineer (QE)
Red Hat - Emerging Technologies