Continue to refactor autoserv to build client test at run time.

client/bin/base_utils.py

 """
 DO NOT import this file directly - import client/bin/utils.py,
 which will mix this in
 
 Convenience functions for use by tests or whomever.
 
 Note that this file is mixed in by utils.py - note very carefully the
 precedence order defined there
 """
 import os, shutil, sys, signal, commands, pickle, glob, statvfs
@@ skipping 45 matching lines @@
     return run_cmd('%s %s | %s' % (cat, file, command),
                                                     ignore_status=ignore_status)
 
 
 def extract_tarball_to_dir(tarball, dir):
     """
     Extract a tarball to a specified directory name instead of whatever
     the top level of a tarball is - useful for versioned directory names, etc
     """
     if os.path.exists(dir):
-        raise NameError, 'target %s already exists' % dir
+      if os.path.isdir(dir):
+        shutil.rmtree(dir)
+      else:
+        os.remove(dir)
     pwd = os.getcwd()
     os.chdir(os.path.dirname(os.path.abspath(dir)))
     newdir = extract_tarball(tarball)
     os.rename(newdir, dir)
     os.chdir(pwd)
 
 
 def extract_tarball(tarball):
     """Returns the directory extracted by the tarball."""
     extracted = cat_file_to_cmd(tarball, 'tar xvf - 2>/dev/null',
@@ skipping 693 matching lines @@
     Suspend the system to RAM (S3)
     """
     set_power_state('mem')
 
 
 def suspend_to_disk():
     """
     Suspend the system to disk (S4)
     """
     set_power_state('disk')