Robert Foley <robert.fo...@linaro.org> writes:
> Add change to increase timeout waiting for VM to boot.
> Needed for some emulation cases where it can take longer
> than 5 minutes to boot.
>
> Signed-off-by: Robert Foley <robert.fo...@linaro.org>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tests/vm/basevm.py | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index 991115e44b..4de358ae22 100755
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -59,6 +59,10 @@ class BaseVM(object):
> poweroff = "poweroff"
> # enable IPv6 networking
> ipv6 = True
> + # Scale up some timeouts under TCG.
> + # 4 is arbitrary, but greater than 2,
> + # since we found we need to wait more than twice as long.
> + tcg_ssh_timeout_multiplier = 4
> def __init__(self, debug=False, vcpus=None):
> self._guest = None
> self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
> @@ -311,6 +315,9 @@ class BaseVM(object):
> sys.stderr.write("### %s ...\n" % text)
>
> def wait_ssh(self, seconds=300):
> + # Allow more time for VM to boot under TCG.
> + if not kvm_available(self.arch):
> + seconds *= self.tcg_ssh_timeout_multiplier
> starttime = datetime.datetime.now()
> endtime = starttime + datetime.timedelta(seconds=seconds)
> guest_up = False
--
Alex Bennée
