On Mon, Jul 05, 2010 at 07:26:12PM +0300, Michael Goldish wrote:
> Instead of hardcoding binary paths, use kvm_utils.find_command().
> This should make the KVM test a little more distro independent.
>
> Changes from v1:
> - Fix a mistake in kvm_preprocessing.py (used 'command' instead of 'cmd')
>
> Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
Reviewed-by: Amos Kong <akong@xxxxxxxxxx>
Looks good for me, In the past, I've to create symbolic links for fix this issue.
> ---
> client/tests/kvm/kvm_preprocessing.py | 6 +++---
> client/tests/kvm/kvm_utils.py | 7 ++++---
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
> index ee279bd..9ae0e08 100644
> --- a/client/tests/kvm/kvm_preprocessing.py
> +++ b/client/tests/kvm/kvm_preprocessing.py
> @@ -208,10 +208,10 @@ def preprocess(test, params, env):
> env["tcpdump"].close()
> del env["tcpdump"]
> if "tcpdump" not in env and params.get("run_tcpdump", "yes") == "yes":
> - command = "/usr/sbin/tcpdump -npvi any 'dst port 68'"
> - logging.debug("Starting tcpdump (%s)...", command)
> + cmd = "%s -npvi any 'dst port 68'" % kvm_utils.find_command("tcpdump")
> + logging.debug("Starting tcpdump (%s)...", cmd)
> env["tcpdump"] = kvm_subprocess.kvm_tail(
> - command=command,
> + command=cmd,
> output_func=_update_address_cache,
> output_params=(env["address_cache"],))
> if kvm_utils.wait_for(lambda: not env["tcpdump"].is_alive(),
> diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py
> index a57a334..4183f1c 100644
> --- a/client/tests/kvm/kvm_utils.py
> +++ b/client/tests/kvm/kvm_utils.py
> @@ -250,19 +250,20 @@ def verify_ip_address_ownership(ip, macs, timeout=10.0):
> regex = re.compile(r"\b%s\b.*\b(%s)\b" % (ip, mac_regex), re.IGNORECASE)
>
> # Check the ARP cache
> - o = commands.getoutput("/sbin/arp -n")
> + o = commands.getoutput("%s -n" % find_command("arp"))
> if regex.search(o):
> return True
>
> # Get the name of the bridge device for arping
> - o = commands.getoutput("/sbin/ip route get %s" % ip)
> + o = commands.getoutput("%s route get %s" % (find_command("ip"), ip))
> dev = re.findall("dev\s+\S+", o, re.IGNORECASE)
> if not dev:
> return False
> dev = dev[0].split()[-1]
>
> # Send an ARP request
> - o = commands.getoutput("/sbin/arping -f -c 3 -I %s %s" % (dev, ip))
> + o = commands.getoutput("%s -f -c 3 -I %s %s" %
> + (find_command("arping"), dev, ip))
> return bool(regex.search(o))
>
>
> --
> 1.5.4.1
>
> --
> 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
