Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/tests/kvm/tests/clock_getres.py

Index: client/tests/kvm/tests/clock_getres.py
diff --git a/client/tests/kvm/tests/clock_getres.py b/client/tests/kvm/tests/clock_getres.py
deleted file mode 100644
index f85bb2677c396abb5cc83096214cd138100f2282..0000000000000000000000000000000000000000
--- a/client/tests/kvm/tests/clock_getres.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import logging, time, os
-from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib import utils
-import kvm_test_utils, kvm_utils
-
-
-def run_clock_getres(test, params, env):
-    """
-    Verify if guests using kvm-clock as the time source have a sane clock
-    resolution.
-
-    @param test: kvm test object.
-    @param params: Dictionary with test parameters.
-    @param env: Dictionary with the test environment.
-    """
-    t_name = "test_clock_getres"
-    base_dir = "/tmp"
-
-    deps_dir = os.path.join(test.bindir, "deps", t_name)
-    os.chdir(deps_dir)
-    try:
-        utils.system("make clean")
-        utils.system("make")
-    except:
-        raise error.TestError("Failed to compile %s" % t_name)
-
-    test_clock = os.path.join(deps_dir, t_name)
-    if not os.path.isfile(test_clock):
-        raise error.TestError("Could not find %s" % t_name)
-
-    vm = kvm_test_utils.get_living_vm(env, params.get("main_vm"))
-    timeout = int(params.get("login_timeout", 360))
-    session = kvm_test_utils.wait_for_login(vm, timeout=timeout)
-    if not vm.copy_files_to(test_clock, base_dir):
-        raise error.TestError("Failed to copy %s to VM" % t_name)
-    session.cmd(os.path.join(base_dir, t_name))
-    logging.info("PASS: Guest reported appropriate clock resolution")
-    logging.info("guest's dmesg:")
-    session.cmd_output("dmesg")