Merge remote branch 'cros/upstream' into master

client/tests/kvm/get_started.py

 #!/usr/bin/python
 """
 Program to help setup kvm test environment
 
 @copyright: Red Hat 2010
 """
 
-import os, sys, optparse, logging, shutil
+import os, sys, logging, shutil
 import common, kvm_utils
 from autotest_lib.client.common_lib import logging_manager
-from autotest_lib.client.bin import utils, os_dep
+from autotest_lib.client.bin import utils
 
 
 def check_iso(url, destination, hash):
     """
     Verifies if ISO that can be find on url is on destination with right hash.
 
     This function will verify the SHA1 hash of the ISO image. If the file
     turns out to be missing or corrupted, let the user know we can download it.
 
     @param url: URL where the ISO file can be found.
@@ skipping 53 matching lines @@
         dst_file = os.path.join(kvm_test_dir, config_file)
         if not os.path.isfile(dst_file):
             logging.debug("Creating config file %s from sample", dst_file)
             shutil.copyfile(src_file, dst_file)
         else:
             logging.debug("Config file %s exists, not touching" % dst_file)
 
     logging.info("3 - Verifying iso (make sure we have the OS ISO needed for "
                  "the default test set)")
 
-    iso_name = "Fedora-13-x86_64-DVD.iso"
-    fedora_dir = "pub/fedora/linux/releases/13/Fedora/x86_64/iso"
+    iso_name = "Fedora-14-x86_64-DVD.iso"
+    fedora_dir = "pub/fedora/linux/releases/14/Fedora/x86_64/iso"
     url = os.path.join("http://download.fedoraproject.org/", fedora_dir,
                        iso_name)
-    hash = "65c7f1aad3feb888ae3daadaf45d4a2a32b8773a"
+    hash = "38a4078011bac74493db7ecc53c9d9fbc96dbbd5"
     destination = os.path.join(base_dir, 'isos', 'linux')
     check_iso(url, destination, hash)
 
     logging.info("4 - Verifying winutils.iso (make sure we have the utility "
                  "ISO needed for Windows testing)")
 
     logging.info("In order to run the KVM autotests in Windows guests, we "
                  "provide you an ISO that this script can download")
 
     url = "http://people.redhat.com/mrodrigu/kvm/winutils.iso"
@@ skipping 24 matching lines @@
                  "(session 'Install Prerequisite packages')")
 
     client_dir = os.path.abspath(os.path.join(kvm_test_dir, "..", ".."))
     autotest_bin = os.path.join(client_dir, 'bin', 'autotest')
     control_file = os.path.join(kvm_test_dir, 'control')
     logging.info("When you are done fixing eventual warnings found, "
                  "you can run the kvm test using the command line AS ROOT:")
     logging.info("%s --verbose %s", autotest_bin, control_file)
     logging.info("You can also edit the test config files (see output of "
                  "step 2 for a list)")