On Sun, Aug 2, 2009 at 8:58 PM, Michael Goldish<mgoldish@xxxxxxxxxx> wrote:
> Instead of failing, just print a warning. Included files may not always be
> crucial for tests to run (kvm_cdkeys.cfg for example).
>
> Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
> ---
> client/tests/kvm/kvm_config.py | 21 +++++++++++----------
> 1 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py
> index e478a55..7ff7a07 100755
> --- a/client/tests/kvm/kvm_config.py
> +++ b/client/tests/kvm/kvm_config.py
> @@ -406,17 +406,18 @@ class config:
> if self.filename:
> filename = os.path.join(os.path.dirname(self.filename),
> words[1])
> - if not os.path.exists(filename):
> - e_msg = "Cannot include %s -- file not found" % filename
> - raise error.AutotestError(e_msg)
> - new_file = open(filename, "r")
> - list = self.parse(new_file, list, restricted)
> - new_file.close()
> - if self.debug and not restricted:
> - self.__debug_print("", "Leaving file %s" % words[1])
> + if os.path.exists(filename):
> + new_file = open(filename, "r")
> + list = self.parse(new_file, list, restricted)
> + new_file.close()
> + if self.debug and not restricted:
> + self.__debug_print("", "Leaving file %s" % words[1])
> + else:
> + print ("WARNING: Cannot include %s -- "
> + "file not found" % filename)
I quite didn't like the above, because to issue messages like that we
should be using the logging infrastructure to avoid to write WARNING,
DEBUG and similar strings. Anyway, I understand why kvm_config.py is
still using print's. I will apply this, but will send later a patch
that makes kvm_config.py to use the logging infrastructure.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
