FAFT: Remove the legacy use_pyauto and use_faft arguments
These two arguements were introduced when ServoTest supported connecting
remote PyAuto and FAFT Client RPC servers. Now ServoTest only serves
FAFT Client, meaning that use_pyauto is always False and use_faft is always
True. So remove these arguments.
BUG=chrome-os-partner:21118;chromium-os:215491
TEST=Manual
Ran the affected test cases, firmware_FAFTSetup, on Spring and passed.
Change-Id: I5c740faddb97f81f052e720548bfce8a39b405e3
Reviewed-on: https://gerrit.chromium.org/gerrit/62641
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index 78c0aaf..c40b688 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -137,7 +137,7 @@
cls._global_setup_done[label] = False
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=False):
+ def initialize(self, host, cmdline_args):
# Parse arguments from command line
args = {}
self.power_control = host.POWER_CONTROL_RPM
@@ -166,28 +166,27 @@
logging.warning('Firmware update will not not performed '
'since no image is specified.')
- super(FAFTSequence, self).initialize(host, cmdline_args, use_pyauto,
- use_faft)
- if use_faft:
- self.client_attr = FAFTClientAttribute(
- self.faft_client.system.get_platform_name())
- self.delay = FAFTDelayConstants(
- self.faft_client.system.get_platform_name())
- self.checkers = FAFTCheckers(self, self.faft_client)
+ super(FAFTSequence, self).initialize(host)
- if self.client_attr.chrome_ec:
- self.ec = chrome_ec.ChromeEC(self.servo)
+ self.client_attr = FAFTClientAttribute(
+ self.faft_client.system.get_platform_name())
+ self.delay = FAFTDelayConstants(
+ self.faft_client.system.get_platform_name())
+ self.checkers = FAFTCheckers(self, self.faft_client)
- if not self.client_attr.has_keyboard:
- # The environment variable USBKM232_UART_DEVICE should point
- # to the USB-KM232 UART device.
- if ('USBKM232_UART_DEVICE' not in os.environ or
- not os.path.exists(os.environ['USBKM232_UART_DEVICE'])):
- raise error.TestError('Must set a valid environment '
- 'variable USBKM232_UART_DEVICE.')
+ if self.client_attr.chrome_ec:
+ self.ec = chrome_ec.ChromeEC(self.servo)
- # Setting up key matrix mapping
- self.servo.set_key_matrix(self.client_attr.key_matrix_layout)
+ if not self.client_attr.has_keyboard:
+ # The environment variable USBKM232_UART_DEVICE should point
+ # to the USB-KM232 UART device.
+ if ('USBKM232_UART_DEVICE' not in os.environ or
+ not os.path.exists(os.environ['USBKM232_UART_DEVICE'])):
+ raise error.TestError('Must set a valid environment '
+ 'variable USBKM232_UART_DEVICE.')
+
+ # Setting up key matrix mapping
+ self.servo.set_key_matrix(self.client_attr.key_matrix_layout)
def setup(self, ec_wp=None):
diff --git a/server/cros/servo_test.py b/server/cros/servo_test.py
index f8c9e82..72bd8c4 100644
--- a/server/cros/servo_test.py
+++ b/server/cros/servo_test.py
@@ -25,15 +25,9 @@
_SSH_CONFIG = ('-o StrictHostKeyChecking=no '
'-o UserKnownHostsFile=/dev/null ')
- def initialize(self, host, _, use_pyauto=False, use_faft=False):
+ def initialize(self, host):
"""Create a Servo object and install the dependency.
"""
- # TODO(jrbarnette): Part of the incomplete refactoring:
- # assert here that there are no legacy callers passing
- # parameters for functionality that's been deprecated and
- # removed.
- assert use_faft and not use_pyauto
-
self.servo = host.servo
self.faft_client = None
self._client = host
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index c71cb3f..9f6940e 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -30,7 +30,6 @@
def run_cgptstate(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptState", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_cgptstate, machines)
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index be736ef..0d2ae9d 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -26,7 +26,6 @@
def run_cgptstress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_cgptstress, machines)
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index da08ffb..4bd1561 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -26,7 +26,6 @@
def run_cgptstress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_cgptstress, machines)
diff --git a/server/site_tests/firmware_CgptStress/firmware_CgptStress.py b/server/site_tests/firmware_CgptStress/firmware_CgptStress.py
index eb4dcab..bad248d 100644
--- a/server/site_tests/firmware_CgptStress/firmware_CgptStress.py
+++ b/server/site_tests/firmware_CgptStress/firmware_CgptStress.py
@@ -16,12 +16,11 @@
version = 1
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
# Parse arguments from command line
dict_args = utils.args_to_dict(cmdline_args)
self.faft_iterations = int(dict_args.get('faft_iterations', 1))
- super(firmware_CgptStress, self).initialize(host, cmdline_args,
- use_pyauto, use_faft)
+ super(firmware_CgptStress, self).initialize(host, cmdline_args)
def setup(self, dev_mode=False):
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 9d7d6be..8223822 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -28,7 +28,6 @@
def run_consecutive_boot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_consecutive_boot, machines)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 0f241d9..6d1ad4b 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -28,7 +28,6 @@
def run_consecutive_boot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_consecutive_boot, machines)
diff --git a/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py b/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
index b5d4b4f..dc27ab4 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
+++ b/server/site_tests/firmware_ConsecutiveBoot/firmware_ConsecutiveBoot.py
@@ -21,12 +21,11 @@
version = 1
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
# Parse arguments from command line
dict_args = utils.args_to_dict(cmdline_args)
self.faft_iterations = int(dict_args.get('faft_iterations', 1))
- super(firmware_ConsecutiveBoot, self).initialize(host, cmdline_args,
- use_pyauto, use_faft)
+ super(firmware_ConsecutiveBoot, self).initialize(host, cmdline_args)
def setup(self, dev_mode=False):
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index 67f6ff0..766ceb6 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -32,7 +32,6 @@
def run_corruptbothfwbodyab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptbothfwbodyab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index 6d5b099..c9b1d4c 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -32,7 +32,6 @@
def run_corruptbothfwbodyab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptbothfwbodyab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index 0e0645f..8764383 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -28,7 +28,6 @@
def run_corruptbothfwsigab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptbothfwsigab, machines)
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 182964a..3e6669a 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -28,7 +28,6 @@
def run_corruptbothfwsigab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptbothfwsigab, machines)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index 1e776e8..816def7 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -30,7 +30,6 @@
def run_corruptbothkernelab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptbothkernelab, machines)
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index b835088..324f398 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -30,7 +30,6 @@
def run_corruptbothkernelab(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptbothkernelab, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 1ab19d2..339f6fa 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -30,7 +30,6 @@
def run_corruptfwbodya(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptfwbodya, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index c63f0c1..e91ebb3 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -30,7 +30,6 @@
def run_corruptfwbodya(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptfwbodya, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 766180c..70bacbd 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -30,7 +30,6 @@
def run_corruptfwbodyb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptfwbodyb, machines)
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index 059250f..f95b043 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -30,7 +30,6 @@
def run_corruptfwbodyb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptfwbodyb, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index a625954..3f3c075 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -24,7 +24,6 @@
def run_corruptfwsiga(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptfwsiga, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index 379704b..2cb43eb 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -24,7 +24,6 @@
def run_corruptfwsiga(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptfwsiga, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index fedc48f..8a7efe8 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -24,7 +24,6 @@
def run_corruptfwsigb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptfwsigb, machines)
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index b120d4b..afdae53 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -24,7 +24,6 @@
def run_corruptfwsigb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptfwsigb, machines)
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index 826eb9a..be2bdaa 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -25,7 +25,6 @@
def run_corruptkernela(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptkernela, machines)
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index c4619c0..26b1dfc 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -25,7 +25,6 @@
def run_corruptkernela(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptkernela, machines)
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index 757769e..4feae44 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -26,7 +26,6 @@
def run_corruptkernelb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_corruptkernelb, machines)
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index 73d33fb..a6d6082 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -26,7 +26,6 @@
def run_corruptkernelb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_corruptkernelb, machines)
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 35c6a98..29ebdba 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -28,7 +28,6 @@
def run_devbootusb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevBootUSB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_devbootusb, machines)
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index 218ec82..c4aadcd 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -28,7 +28,6 @@
def run_devfwnormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevFwNormalBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_devfwnormalboot, machines)
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 0ff81b2..643fe37 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -24,7 +24,6 @@
def run_devmode(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevMode", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_devmode, machines)
diff --git a/server/site_tests/firmware_DevMode/control.ec_wp b/server/site_tests/firmware_DevMode/control.ec_wp
index 7b12bcd..79d46ed 100644
--- a/server/site_tests/firmware_DevMode/control.ec_wp
+++ b/server/site_tests/firmware_DevMode/control.ec_wp
@@ -24,7 +24,6 @@
def run_devmode(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevMode", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, ec_wp=True, tag="ec_wp")
+ disable_sysinfo=True, dev_mode=False, ec_wp=True, tag="ec_wp")
parallel_simple(run_devmode, machines)
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 2557a56..c663ae0 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -25,6 +25,6 @@
def run_devmodestress(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevModeStress", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True, dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_devmodestress, machines)
diff --git a/server/site_tests/firmware_DevModeStress/firmware_DevModeStress.py b/server/site_tests/firmware_DevModeStress/firmware_DevModeStress.py
index 0b80427..0e12519 100644
--- a/server/site_tests/firmware_DevModeStress/firmware_DevModeStress.py
+++ b/server/site_tests/firmware_DevModeStress/firmware_DevModeStress.py
@@ -51,12 +51,11 @@
time.sleep(self.EC_SUSPEND_DELAY)
wake_func()
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
# Parse arguments from command line
dict_args = utils.args_to_dict(cmdline_args)
self.faft_iterations = int(dict_args.get('faft_iterations', 1))
- super(firmware_DevModeStress, self).initialize(host, cmdline_args,
- use_pyauto, use_faft)
+ super(firmware_DevModeStress, self).initialize(host, cmdline_args)
def setup(self):
super(firmware_DevModeStress, self).setup()
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index ef893d3..4be49c2 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -32,7 +32,6 @@
def run_devscreentimeout(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevScreenTimeout", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_devscreentimeout, machines)
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index 44dfc02..b68b822 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -27,7 +27,6 @@
def run_devtriggerrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevTriggerRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_devtriggerrecovery, machines)
diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index 0499edf..c8a61d4 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -24,6 +24,6 @@
def run_ecadc(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECAdc", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecadc, machines)
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 71b88c3..3377cab 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -24,6 +24,6 @@
def run_ecbattery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECBattery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecbattery, machines)
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index ff39a1a..355a64d 100644
--- a/server/site_tests/firmware_ECBootTime/control
+++ b/server/site_tests/firmware_ECBootTime/control
@@ -24,6 +24,6 @@
def run_ecboottime(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECBootTime", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecboottime, machines)
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index 648ca07..97fb4ea 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -28,6 +28,6 @@
def run_eccharging(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECCharging", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_eccharging, machines)
diff --git a/server/site_tests/firmware_ECHash/control b/server/site_tests/firmware_ECHash/control
index 4039ac0..3f946d0 100644
--- a/server/site_tests/firmware_ECHash/control
+++ b/server/site_tests/firmware_ECHash/control
@@ -28,6 +28,6 @@
def run_echash(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECHash", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_echash, machines)
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index 9e5f8b3..39af9c5 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -24,6 +24,6 @@
def run_eckeyboard(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECKeyboard", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_eckeyboard, machines)
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 195de5f..373ca1a 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -29,6 +29,6 @@
def run_eclidswitch(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECLidSwitch", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_eclidswitch, machines)
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index fc270cf..6b64583 100644
--- a/server/site_tests/firmware_ECPeci/control
+++ b/server/site_tests/firmware_ECPeci/control
@@ -25,6 +25,6 @@
def run_ecpeci(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPeci", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecpeci, machines)
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 285bbbe..8e34228 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -30,6 +30,6 @@
def run_ecpowerbutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPowerButton", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecpowerbutton, machines)
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index 541bd5d..12ce84e 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -24,6 +24,6 @@
def run_ecpowerg3(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPowerG3", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecpowerg3, machines)
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index e9978a9..2db9b4c 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -27,6 +27,6 @@
def run_ecsharedmem(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECSharedMem", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecsharedmem, machines)
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 3c17b9c..4cfe780 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -25,6 +25,6 @@
def run_ecthermal(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECThermal", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecthermal, machines)
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index 0711be6..a03a9f8 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -24,6 +24,6 @@
def run_ecusbports(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECUsbPorts", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecusbports, machines)
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index e646d62..c27f48a 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -25,6 +25,6 @@
def run_ecwakesource(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWakeSource", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecwakesource, machines)
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index 7e3968a..0fc8de8 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -24,6 +24,6 @@
def run_ecwatchdog(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWatchdog", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_ecwatchdog, machines)
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index 5a66d0f..7cb3a46 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -36,7 +36,6 @@
def run_ecwriteprotect(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_ecwriteprotect, machines)
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index f2888d9..fb53054 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -36,7 +36,6 @@
def run_ecwriteprotect(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_ecwriteprotect, machines)
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index e3e9584..e82304e 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -35,6 +35,6 @@
def run_faftsetup(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FAFTSetup", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_faftsetup, machines)
diff --git a/server/site_tests/firmware_FAFTSetup/firmware_FAFTSetup.py b/server/site_tests/firmware_FAFTSetup/firmware_FAFTSetup.py
index 02fe072..ad6c3e7 100644
--- a/server/site_tests/firmware_FAFTSetup/firmware_FAFTSetup.py
+++ b/server/site_tests/firmware_FAFTSetup/firmware_FAFTSetup.py
@@ -31,7 +31,7 @@
KEY_PRESS_DELAY = 2
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
dict_args = utils.args_to_dict(cmdline_args)
spec_check = dict_args.get("spec_check", "False")
if spec_check.lower() == "true":
@@ -40,8 +40,7 @@
self._spec_check = False
else:
raise error.TestFail("Invalid argument spec_check=%s." % spec_check)
- super(firmware_FAFTSetup, self).initialize(host, cmdline_args,
- use_pyauto, use_faft)
+ super(firmware_FAFTSetup, self).initialize(host, cmdline_args)
def console_checker(self):
"""Verify EC console is available if using Chrome EC."""
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index 819f6e0..a6c4ab3 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -27,7 +27,6 @@
def run_fwscreencloselid(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FwScreenCloseLid", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_fwscreencloselid, machines)
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index cac3eb9..c0f8044 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -27,7 +27,6 @@
def run_fwscreenpresspower(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FwScreenPressPower", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_fwscreenpresspower, machines)
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 8143665..8d87ff0 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -27,7 +27,6 @@
def run_invalidusb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_InvalidUSB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_invalidusb, machines)
diff --git a/server/site_tests/firmware_LegacyRecovery/control b/server/site_tests/firmware_LegacyRecovery/control
index 2753ad8..c96ea98 100644
--- a/server/site_tests/firmware_LegacyRecovery/control
+++ b/server/site_tests/firmware_LegacyRecovery/control
@@ -26,7 +26,6 @@
def run_legacyrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_LegacyRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_legacyrecovery, machines)
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index 721e34f..577bf5a 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -24,7 +24,6 @@
def run_ronormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_ronormalboot, machines)
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index 2dadc73..0ae34a8 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -24,7 +24,6 @@
def run_ronormalboot(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_ronormalboot, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index b205637..530ec1c 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -27,7 +27,6 @@
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_recoverybutton, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index 77b842a..4300ef1 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -27,7 +27,6 @@
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_recoverybutton, machines)
diff --git a/server/site_tests/firmware_RecoveryButton/control.ec_wp b/server/site_tests/firmware_RecoveryButton/control.ec_wp
index 152c329..2c7e873 100644
--- a/server/site_tests/firmware_RecoveryButton/control.ec_wp
+++ b/server/site_tests/firmware_RecoveryButton/control.ec_wp
@@ -27,7 +27,6 @@
def run_recoverybutton(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, ec_wp=True, tag="ec_wp")
+ disable_sysinfo=True, dev_mode=False, ec_wp=True, tag="ec_wp")
parallel_simple(run_recoverybutton, machines)
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index ffc00ec..811d232 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -27,7 +27,6 @@
def run_rollbackfirmware(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_rollbackfirmware, machines)
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index a8f5570..50157ee 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -27,7 +27,6 @@
def run_rollbackfirmware(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_rollbackfirmware, machines)
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index 094d0d4..eee6abe 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -28,7 +28,6 @@
def run_rollbackkernel(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_rollbackkernel, machines)
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index 5b210c3..fe1adb6 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -28,7 +28,6 @@
def run_rollbackkernel(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_rollbackkernel, machines)
diff --git a/server/site_tests/firmware_SelfSignedBoot/control b/server/site_tests/firmware_SelfSignedBoot/control
index 4c031e3..d17cddd 100644
--- a/server/site_tests/firmware_SelfSignedBoot/control
+++ b/server/site_tests/firmware_SelfSignedBoot/control
@@ -39,7 +39,6 @@
def run_devbootsignedonly(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test('firmware_SelfSignedBoot', host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag='dev')
+ disable_sysinfo=True, dev_mode=True, tag='dev')
parallel_simple(run_devbootsignedonly, machines)
diff --git a/server/site_tests/firmware_ShellBall/control b/server/site_tests/firmware_ShellBall/control
index c626338..9192bac 100644
--- a/server/site_tests/firmware_ShellBall/control
+++ b/server/site_tests/firmware_ShellBall/control
@@ -39,6 +39,6 @@
cmdline_args=args,
shellball_path=opts['shellball_path'],
shellball_name=opts['shellball_name'],
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_shellball, machines)
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index 5551eba..bb7b9c1 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -24,7 +24,6 @@
def run_softwaresync(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_softwaresync, machines)
diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index ee48e8a..69fddab 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -24,7 +24,6 @@
def run_softwaresync(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_softwaresync, machines)
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index fb139e4..9b63dda 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -24,7 +24,6 @@
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_tryfwb, machines)
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 7c0483f..92d6be1 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -24,7 +24,6 @@
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_tryfwb, machines)
diff --git a/server/site_tests/firmware_TryFwB/control.ec_wp b/server/site_tests/firmware_TryFwB/control.ec_wp
index 0b1bc21..e91f7e5 100644
--- a/server/site_tests/firmware_TryFwB/control.ec_wp
+++ b/server/site_tests/firmware_TryFwB/control.ec_wp
@@ -24,7 +24,7 @@
def run_tryfwb(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, ec_wp=True, tag="ec_wp")
+ disable_sysinfo=True, dev_mode=False, ec_wp=True,
+ tag="ec_wp")
parallel_simple(run_tryfwb, machines)
diff --git a/server/site_tests/firmware_UpdateECBin/control b/server/site_tests/firmware_UpdateECBin/control
index cad1a8c..2a97216 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -55,7 +55,6 @@
def run_updateec(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_updateec, machines)
diff --git a/server/site_tests/firmware_UpdateECBin/control.dev b/server/site_tests/firmware_UpdateECBin/control.dev
index d45e523..76bc3bc 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -55,7 +55,6 @@
def run_updateec(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_updateec, machines)
diff --git a/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py b/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
index 68e8d9f..bb2d587 100644
--- a/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
+++ b/server/site_tests/firmware_UpdateECBin/firmware_UpdateECBin.py
@@ -33,7 +33,7 @@
version = 1
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
# Parse arguments from command line
dict_args = utils.args_to_dict(cmdline_args)
if 'new_ec' not in dict_args or not os.path.isfile(dict_args['new_ec']):
@@ -44,8 +44,7 @@
'included in the firmware_from_source.tar.bz2.')
self.arg_new_ec = dict_args['new_ec']
logging.info('The EC image to-be-updated is: %s', self.arg_new_ec)
- super(firmware_UpdateECBin, self).initialize(host, cmdline_args,
- use_pyauto, use_faft)
+ super(firmware_UpdateECBin, self).initialize(host, cmdline_args)
def setup(self, host, dev_mode=False):
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index 366bae0..a17f7b3 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -42,6 +42,6 @@
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateFirmwareDataKeyVersion",
host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_updatefirmwaredatakeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
index 06b83e3..2fe5c18 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
@@ -57,11 +57,11 @@
self.faft_client.updater.run_recovery()
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
dict_args = utils.args_to_dict(cmdline_args)
self.use_shellball = dict_args.get('shellball', None)
super(firmware_UpdateFirmwareDataKeyVersion, self).initialize(
- host, cmdline_args, use_pyauto, use_faft)
+ host, cmdline_args)
def setup(self, host=None):
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index c26c32f..1d3d369 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -43,6 +43,6 @@
def run_updatefirmwareversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateFirmwareVersion", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ disable_sysinfo=True)
parallel_simple(run_updatefirmwareversion, machines)
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/firmware_UpdateFirmwareVersion.py b/server/site_tests/firmware_UpdateFirmwareVersion/firmware_UpdateFirmwareVersion.py
index d08ad29..dd962ef 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/firmware_UpdateFirmwareVersion.py
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/firmware_UpdateFirmwareVersion.py
@@ -42,11 +42,11 @@
self.faft_client.updater.run_recovery()
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
dict_args = utils.args_to_dict(cmdline_args)
self.use_shellball = dict_args.get('shellball', None)
super(firmware_UpdateFirmwareVersion, self).initialize(
- host, cmdline_args, use_pyauto, use_faft)
+ host, cmdline_args)
def setup(self):
self.backup_firmware()
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index ccd6c9c..62ce7f8 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -37,7 +37,7 @@
def run_updatekerneldatakeyversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelDataKeyVersion", host=host,
- cmdline_args=args,use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ cmdline_args=args, disable_sysinfo=True, dev_mode=True,
+ tag="dev")
parallel_simple(run_updatekerneldatakeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index d717487..702d2b4 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -33,7 +33,6 @@
def run_updatekernelsubkeyversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelSubkeyVersion",
- host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True)
+ host=host, cmdline_args=args, disable_sysinfo=True)
parallel_simple(run_updatekernelsubkeyversion, machines)
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/firmware_UpdateKernelSubkeyVersion.py b/server/site_tests/firmware_UpdateKernelSubkeyVersion/firmware_UpdateKernelSubkeyVersion.py
index 06c6651..73fb45a 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/firmware_UpdateKernelSubkeyVersion.py
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/firmware_UpdateKernelSubkeyVersion.py
@@ -54,11 +54,11 @@
self.faft_client.updater.run_recovery()
- def initialize(self, host, cmdline_args, use_pyauto=False, use_faft=True):
+ def initialize(self, host, cmdline_args):
dict_args = utils.args_to_dict(cmdline_args)
self.use_shellball = dict_args.get('shellball', None)
super(firmware_UpdateKernelSubkeyVersion, self).initialize(
- host, cmdline_args, use_pyauto, use_faft)
+ host, cmdline_args)
def setup(self, host=None):
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index b6deb2b..fc33b65 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -35,7 +35,6 @@
def run_updatekernelversion(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelVersion", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_updatekernelversion, machines)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index 76fd8cf..14854bb 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -28,7 +28,6 @@
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal")
+ disable_sysinfo=True, dev_mode=False, tag="normal")
parallel_simple(run_userrequestrecovery, machines)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index c2a61ca..f7545c0 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -28,7 +28,6 @@
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev")
+ disable_sysinfo=True, dev_mode=True, tag="dev")
parallel_simple(run_userrequestrecovery, machines)
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
index 43cf96b..905b6af 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
+++ b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
@@ -28,7 +28,6 @@
def run_userrequestrecovery(machine):
host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, ec_wp=True, tag="ec_wp")
+ disable_sysinfo=True, dev_mode=False, ec_wp=True, tag="ec_wp")
parallel_simple(run_userrequestrecovery, machines)
diff --git a/server/site_tests/suites/control.faft_bios b/server/site_tests/suites/control.faft_bios
index 692efac..df60c9b 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -58,13 +58,11 @@
client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal",
+ disable_sysinfo=True, dev_mode=False, tag="normal",
**argv)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev",
+ disable_sysinfo=True, dev_mode=True, tag="dev",
**argv)
parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv1 b/server/site_tests/suites/control.faft_lv1
index ec8a595..95bb1aa 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -44,13 +44,11 @@
client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal",
+ disable_sysinfo=True, dev_mode=False, tag="normal",
**argv)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev",
+ disable_sysinfo=True, dev_mode=True, tag="dev",
**argv)
parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv2 b/server/site_tests/suites/control.faft_lv2
index 50b1642..6190773 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -48,13 +48,11 @@
client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal",
+ disable_sysinfo=True, dev_mode=False, tag="normal",
**argv)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev",
+ disable_sysinfo=True, dev_mode=True, tag="dev",
**argv)
parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv3 b/server/site_tests/suites/control.faft_lv3
index 4492579..e334781 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -54,13 +54,11 @@
client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal",
+ disable_sysinfo=True, dev_mode=False, tag="normal",
**argv)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev",
+ disable_sysinfo=True, dev_mode=True, tag="dev",
**argv)
parallel_simple(run_server_test, machines)
diff --git a/server/site_tests/suites/control.faft_lv4 b/server/site_tests/suites/control.faft_lv4
index 445dcc2..6999f96 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -47,13 +47,11 @@
client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=False, tag="normal",
+ disable_sysinfo=True, dev_mode=False, tag="normal",
**argv)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_DEV_MODE:
job.run_test(test, host=client, cmdline_args=args,
- use_faft=True, disable_sysinfo=True,
- dev_mode=True, tag="dev",
+ disable_sysinfo=True, dev_mode=True, tag="dev",
**argv)
parallel_simple(run_server_test, machines)