Re: [Autotest] [PATCH 2/3] KVM test: Modify enospc test to not require scripts/check_image.py

[Michael Goldish <mgoldish@redhat.com>]

On 01/19/2011 01:45 AM, Lucas Meneghel Rodrigues wrote:
> With this we prepare to remove the aforementioned script.
> 
> Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
> ---
>  client/tests/kvm/tests/enospc.py |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/client/tests/kvm/tests/enospc.py b/client/tests/kvm/tests/enospc.py
> index 2d8b628..4dd694f 100644
> --- a/client/tests/kvm/tests/enospc.py
> +++ b/client/tests/kvm/tests/enospc.py
> @@ -1,7 +1,7 @@
>  import logging, commands, time, os, re
>  from autotest_lib.client.common_lib import error
>  from autotest_lib.client.bin import utils
> -import kvm_test_utils
> +import kvm_test_utils, kvm_vm
>  
>  
>  def run_enospc(test, params, env):
> @@ -46,11 +46,11 @@ def run_enospc(test, params, env):
>          if "paused" in status:
>              pause_n += 1
>              logging.info("Checking all images in use by the VM")
> -            script_path = os.path.join(test.bindir, "scripts/check_image.py")
> -            try:
> -                cmd_result = utils.run('python %s' % script_path)
> -            except error.CmdError, e:
> -                logging.debug(e.result_obj.stdout)
> +            for image_name in vm.params.objects("images"):
> +                image_params = vm.params.object_params(image_name)
> +                # Just to make sure the image check won't throw exceptions
> +                image_params["check_image_critical"] = 'no'

I think this would be nicer:

try:
    ...
except VMError, e:
    logging.warn(e)

> +                kvm_vm.check_image(image_params, test.bindir)
>              logging.info("Guest paused, extending Logical Volume size")
>              try:
>                  cmd_result = utils.run("lvextend -L +200M /dev/vgtest/lvtest")