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

tests/lab/runner_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 20 matching lines @@
 
 """Utility functions for running the lab tests.
 
 """
 
 import logging
 import os
 import subprocess
 import shutil
 import sys
-import time
 
 import runner_constants as const
 import util
 
 CHANGE_RESOLUTION_PATH = (const.O3D_PATH + '/o3d/tests/lab' 
                           '/ChangeResolution/Debug/changeresolution.exe')
 
 def EnsureWindowsScreenResolution(width, height, bpp):
   """Performs all steps needed to configure system for testing on Windows.
 
@@ skipping 27 matching lines @@
     os.environ['PYTHONPATH'] = path
 
   # Need to put at front of sys.path so python will try to import modules from
   # path before locations further down the sys.path.
   sys.path = [path] + sys.path
 
 
 def InstallO3DPlugin():
   """Installs O3D plugin."""
   
+  logging.info('Installing plugin...')
   if util.IsWindows():
     installer_path = os.path.join(const.PRODUCT_DIR_PATH, 'o3d.msi')
+  
+    if not os.path.exists(installer_path):
+      logging.error('Installer path not found, %s' % installer_path)
+      return False
+      
+    install_command = 'msiexec.exe /i "%s"' % installer_path
+    if util.RunStr(install_command) != 0:
+      return False
+
   elif util.IsMac():
     dmg_path = os.path.join(const.PRODUCT_DIR_PATH, 'o3d.dmg')
-    volumes_path = util.MountDiskImage(dmg_path)
-    if volumes_path is None:
+    mnt = util.MountDiskImage(dmg_path)
+    if mnt is None:
       return False
-    else:
-      installer_path = os.path.join(volumes_path, 'O3D.mpkg')
+    (device, volumes_path) = mnt
+    
+    installer_path = os.path.join(volumes_path, 'O3D.mpkg')
+
+    if not os.path.exists(installer_path):
+      logging.error('Installer path not found, %s' % installer_path)
+      util.UnmountDiskImage(device)
+      return False
+      
+    admin_password = 'g00gl3'
+    install_command = ('echo %s | sudo -S /usr/sbin/installer -pkg '
+                       '"%s" -target /' % (admin_password, installer_path))
+                       
+    ret_code = util.RunStr(install_command)
+    util.UnmountDiskImage(device)
+    if ret_code != 0:
+      return False
+    
   else:
     plugin_path = os.path.join(const.PRODUCT_DIR_PATH, 'libnpo3dautoplugin.so')
     plugin_dst_dir = os.path.expanduser('~/.mozilla/plugins')
     try:
       os.makedirs(plugin_dst_dir)
     except os.error:
       pass
 
     plugin_dst = os.path.join(plugin_dst_dir, 'libnpo3dautoplugin.so')
     shutil.copyfile(plugin_path, plugin_dst)
     return True
     
-  logging.info('Installing plugin:"%s"', installer_path)
-
-  if not os.path.exists(installer_path):
-    logging.error('Installer path not found, %s' % installer_path)
-    return False
-
-  if util.IsWindows():
-    install_command = 'msiexec.exe /i "%s"' % installer_path
-  elif util.IsMac():
-    admin_password = 'g00gl3'
-    install_command = ('echo %s | sudo -S /usr/sbin/installer -pkg '
-                       '"%s" -target /' % (admin_password, installer_path))
-
-  logging.info('Installing...')
-  result = os.system(install_command)
-  if result:
-    logging.error('Install failed.')
-    return False
-  logging.info('Installed.')
-  
-  if util.IsMac():
-    util.UnmountDiskImage(volumes_path)
-  
   return True
 
 def UninstallO3DPlugin():
   """Uninstalls O3D.
   
   Returns:
     True, if O3D is no longer installed."""
   
   if util.IsWindows():
     installer_path = os.path.join(const.PRODUCT_DIR_PATH, 'o3d.msi')
@@ skipping 10 matching lines @@
   return not DoesAnO3DPluginExist()
 
 def DoesAnO3DPluginExist():
   for path in const.INSTALL_PATHS:
     if os.path.exists(path):
       return True
   return False