[parted-devel] [PATCH 1/2] Increase timeout for rmmod scsi_debug and make it a framework failure

[Sebastian Parschauer]

On 24.02.2017 22:07, Brian C. Lane wrote:
> On some hardware scsi_debug can take longer to remove. If this fails it
> inevitably results in the next test failing since it cannot load
> scsi_debug.
> 
> Increse the timeout to 40 loops (8 seconds), and if it hits the limit
> without succeeding call framework_failure_
> ---
>  tests/t-local.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/t-local.sh b/tests/t-local.sh
> index 13073d2..2ba7ee1 100644
> --- a/tests/t-local.sh
> +++ b/tests/t-local.sh
> @@ -27,13 +27,14 @@ scsi_debug_cleanup_()
>      # "Module scsi_debug is in use".
>      i=0
>      udevadm settle
> -    while [ $i -lt 10 ] ; do
> +    while [ $i -lt 40 ] ; do
>        rmmod scsi_debug \
>  	&& { test "$VERBOSE" = yes && warn_ $ME_ rmmod scsi_debug...; break; }
>        sleep .2 || sleep 1
>        i=$((i + 1))
>      done
>      udevadm settle
> +    test $i = 40 && framework_failure_ rmmod scsi_debug failed.
>    fi
>    rm -fr $scsi_debug_lock_dir_
>  }
> 

Acked-by: Sebastian Parschauer <sparschauer at suse.de>