commit cab6be36a26c73dd4e6fa2f85ba48f50cfd92aca
author J. Richard Barnette <jrbarnette@chromium.org> Thu Jul 17 13:07:39 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Jul 18 04:44:27 2014 +0000
tree 31d4900ad2f46f41e0785fb30ae8f425276b677b
parent 4c8022f036732d1e12931a8f6743cfce92ab2fba

Purge the last vestiges of ServoTest

This class has been slated for removal for nearly two years.  All
that remained was a stub with a two-line initialize() method, so,
time to finish the job.

BUG=chromium:215491
TEST=Run FAFTSetup on link

Change-Id: If349e1d335c038c28c8ce65a7dc1ab5dd7f59e32
Reviewed-on: https://chromium-review.googlesource.com/208733
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Commit-Queue: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

server/cros/faft/firmware_test.py

diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index eda80be..89fc250 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -13,12 +13,12 @@
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.server import autotest
+from autotest_lib.server import test
 from autotest_lib.server.cros import vboot_constants as vboot
 from autotest_lib.server.cros.faft.config.config import Config as FAFTConfig
 from autotest_lib.server.cros.faft.rpc_proxy import RPCProxy
 from autotest_lib.server.cros.faft.utils.faft_checkers import FAFTCheckers
 from autotest_lib.server.cros.servo import chrome_ec
-from autotest_lib.server.cros.servo_test import ServoTest
 
 
 class ConnectionError(Exception):
@@ -26,7 +26,7 @@
     pass
 
 
-class FAFTBase(ServoTest):
+class FAFTBase(test.test):
     """The base class of FAFT classes.
 
     It launches the FAFTClient on DUT, such that the test can access its
@@ -36,7 +36,8 @@
     """
     def initialize(self, host):
         """Create a FAFTClient object and install the dependency."""
-        super(FAFTBase, self).initialize(host)
+        self.servo = host.servo
+        self.servo.initialize_dut()
         self._client = host
         self._autotest_client = autotest.Autotest(self._client)
         self._autotest_client.install()

server/cros/servo_test.py

diff --git a/server/cros/servo_test.py b/server/cros/servo_test.py
deleted file mode 100644
index 093803e..0000000
--- a/server/cros/servo_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from autotest_lib.server import test
-
-
-class ServoTest(test.test):
-    """ServoTest: a test subclassing it requires Servo board connected.
-
-    It checks the servo connectivity on initialization.
-    """
-    version = 3
-
-    def initialize(self, host):
-        """Create a Servo object and initialize it."""
-        self.servo = host.servo
-        self.servo.initialize_dut()
-
-    # TODO(waihong): Record the servo logs.