[KVM-AUTOTEST,v2] KVM test: use kvm_utils.find_command() where appropriate

Commit Message

Michael Goldish July 5, 2010, 4:26 p.m. UTC

None

Patch

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))