FAFT: Temporarily remove firmware_CgptState test
The firmware_CgptState test is different from other FAFT tests.
It executes the test routine in DUT and checks the status using
a boot vector, which uses a number to note a system boot state
(like 1 for normal boot, 2 for developer mode boot, etc.).
It introduces unnecessary complication to convert the current
system state to a vector. To achieve a better approach, like
other FAFT tests, should move the test routine to the server side
and checks the output directly from crossystem, cgpt, etc.
This change removes the test temporarily. Will add it back once
the code reorganization is done.
CQ-DEPEND=CL:290203
BUG=chromium:516400
TEST=Ran a FAFT test to checked this change not affect others.
Change-Id: I7f54d6fc28172f7877226a13fa3d6cffac14b01a
Reviewed-on: https://chromium-review.googlesource.com/290326
Commit-Ready: Wai-Hong Tam <waihong@chromium.org>
Tested-by: Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: danny chan <dchan@chromium.org>
diff --git a/client/cros/faft/rpc_functions.py b/client/cros/faft/rpc_functions.py
index 05408c9..946edd0 100755
--- a/client/cros/faft/rpc_functions.py
+++ b/client/cros/faft/rpc_functions.py
@@ -10,8 +10,7 @@
import functools, os, shutil, tempfile
import common
-from autotest_lib.client.cros.faft.utils import (cgpt_state,
- cgpt_handler,
+from autotest_lib.client.cros.faft.utils import (cgpt_handler,
chromeos_interface,
firmware_check_keys,
firmware_updater,
@@ -137,9 +136,6 @@
self._tpm_handler.init(self._chromeos_interface)
self._cgpt_handler = cgpt_handler.CgptHandler(self._chromeos_interface)
- self._cgpt_state = cgpt_state.CgptState(
- 'SHORT', self._chromeos_interface, self._system_get_root_dev(),
- self._cgpt_handler)
self._rootfs_handler = rootfs_handler.RootfsHandler()
self._rootfs_handler.init(self._chromeos_interface)
@@ -671,28 +667,6 @@
"""Retrieve tpm firmware data key version."""
return self._tpm_handler.get_fw_body_version()
- def _cgpt_run_test_loop(self):
- """Run the CgptState test loop. The tst logic is handled in the client.
-
- @return: 0: there are more cgpt tests to execute.
- 1: no more CgptState test, finished.
- """
- return self._cgpt_state.test_loop()
-
- def _cgpt_set_test_step(self, step):
- """Set the CgptState test step.
-
- @param step: A test step number.
- """
- self._cgpt_state.set_step(step)
-
- def _cgpt_get_test_step(self):
- """Get the CgptState test step.
-
- @return: A test step number.
- """
- return self._cgpt_state.get_step()
-
def _cgpt_get_attributes(self):
"""Get kernel attributes."""
rootdev = self._system_get_root_dev()