Adjusted timeouts for a couple failing tests; switched from umount to hdiutil...

tests/lab/util.py

 #!/usr/bin/python2.6.2
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 274 matching lines @@
     
 def Download(url, prefix_dir):
   """Downloads single file at |url| to |prefix_dir|.
   
   Returns:
     local_path: the path to the downloaded file, or None if download was
       unsuccessful."""
   
   parsed_url = urlparse.urlparse(url)
   path = parsed_url[2]
-  cut = path.count('/') - 1
   name = path.rsplit('/', 1)[1]
   local_path = os.path.join(prefix_dir, name)
 
   if not os.path.exists(prefix_dir):
     os.mkdir(prefix_dir)
   urllib.urlretrieve(url, local_path)
   
   if not os.path.exists(local_path):
     logging.error('Could not download %s to %s' % (url, local_path))
     return None  
@@ skipping 13 matching lines @@
     RegMaybeDel(path, name, ERROR)
     
 
 def MountDiskImage(dmg_path):
   """Mounts disk image.
 
   Args:
     dmg_path: path to image that will be mounted.
     
   Returns:
-    Path to mounted disk on success or None on failure.
+    Tuple contaiing device path and mounted path on success, 
+    or None on failure.
   """
   mount_path = None
   logging.info('Mounting %s...' % dmg_path)
 
   cmd = ['hdiutil', 'attach', '"' + dmg_path + '"']
   (return_code, output) = RunWithOutput(cmd)
 
   if return_code == 0 and output:
     # Attempt to grab the mounted path from the command output.
     # This should be safe regardless of actual output.
-    mount_path = output.strip().split('\n')[-1].split('\t')[-1]
+    new_device = output.strip().split('\n')[-1].split('\t')
+    device = new_device[0].strip()
+    mount_path = new_device[-1]
     
-    logging.info('Disk image mounted at %s' % mount_path)
+    logging.info('Device %s mounted at %s' % (device,mount_path))
 
     # Wait for mounting operation to complete.
     time.sleep(10)
     if os.path.exists(mount_path):
       logging.info('Mount point is accessible.')
     else:
       mount_path = None
           
-  if mount_path is None:
+  if mount_path is None or device is None:
     logging.error('Could not mount properly.')
+    return None
     
-  return mount_path
+  return (device, mount_path)
 
 
-def UnmountDiskImage(mount_path):
+def UnmountDiskImage(device):
   """Unmounts disk image.
 
   Args:
-    mount_path: path to unmount.
+    device: path to device to be detached
 
   Returns:
     True on success.
   """
-  logging.info('Unmounting %s...' % mount_path)
+  logging.info('Unmounting device %s...' % device)
 
-  if not os.path.exists(mount_path):
-    logging.warn('Nothing is mounted at this path.')
-    return True
-
-  Run(['umount', '"' + mount_path + '"'])
-
-  time.sleep(10)
-  if os.path.exists(mount_path):
-    logging.error('Image is still mounted at path:"%s"', mount_path)
-    return False
-  else:
-    return True
+  return Run(['hdiutil detach', '"' + device + '"', '-force']) == 0