On Wed, 2010-05-19 at 17:20 +0800, Jason Wang wrote:
> When we do the unattended installation in tap mode, we should use
> vm.get_address() instead of the 'localhost' in order the connect to
> the finish program running in the guest.
>
> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
> ---
> client/tests/kvm/tests/unattended_install.py | 25 +++++++++++++------------
> 1 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py
> index e2cec8e..e71f993 100644
> --- a/client/tests/kvm/tests/unattended_install.py
> +++ b/client/tests/kvm/tests/unattended_install.py
> @@ -17,7 +17,6 @@ def run_unattended_install(test, params, env):
> vm = kvm_test_utils.get_living_vm(env, params.get("main_vm"))
>
> port = vm.get_port(int(params.get("guest_port_unattended_install")))
> - addr = ('localhost', port)
> if params.get("post_install_delay"):
> post_install_delay = int(params.get("post_install_delay"))
> else:
> @@ -31,17 +30,19 @@ def run_unattended_install(test, params, env):
> time_elapsed = 0
> while time_elapsed < install_timeout:
> client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
> - try:
> - client.connect(addr)
> - msg = client.recv(1024)
> - if msg == 'done':
> - if post_install_delay:
> - logging.debug("Post install delay specified, "
> - "waiting %ss...", post_install_delay)
> - time.sleep(post_install_delay)
> - break
> - except socket.error:
> - pass
> + addr = vm.get_address()
> + if addr:
^ Per coding style, we should check for is None
if addr is not None:
> + try:
> + client.connect((addr, port))
> + msg = client.recv(1024)
> + if msg == 'done':
> + if post_install_delay:
> + logging.debug("Post install delay specified, "
> + "waiting %ss...", post_install_delay)
> + time.sleep(post_install_delay)
> + break
> + except socket.error:
> + pass
^ If vm.get_address() returns None, we'll have to fail the test, if we
don't we'll get a false PASS.
> time.sleep(1)
> client.close()
> end_time = time.time()
>
> --
> 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
--
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
