Fixing call to do_reboot_action.
1. Fixed 2 calls to do_reboot_action, which needed to provide the args as tuple.
2. Removed subprocess import since it was not doing anything.
BUG=chromium:371185
TEST=Ran firmware_TryFwB/control.ec_wp (which hit the issue) at desk on peppy
Change-Id: I254758d575415038ac3c4e784cf7e3c3bb11a6f5
Reviewed-on: https://chromium-review.googlesource.com/199843
Reviewed-by: Vic Yang <victoryang@chromium.org>
Tested-by: Yusuf Mohsinally <mohsinally@chromium.org>
diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index 5841bd3..449a612 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -7,7 +7,6 @@
import logging
import os
import re
-import subprocess
import time
import uuid
@@ -656,7 +655,7 @@
if ec_wp != self._old_ec_wp:
logging.info('The test required EC is %swrite-protected. Reboot '
'and flip the state.', '' if ec_wp else 'not ')
- self.do_reboot_action(self.set_ec_write_protect_and_reboot, ec_wp)
+ self.do_reboot_action((self.set_ec_write_protect_and_reboot, ec_wp))
self.wait_dev_screen_and_ctrl_d()
def _restore_ec_write_protect(self):
@@ -666,8 +665,8 @@
if not self.checkers.crossystem_checker(
{'wpsw_boot': '1' if self._old_ec_wp else '0'}):
logging.info('Restore original EC write protection and reboot.')
- self.do_reboot_action(self.set_ec_write_protect_and_reboot,
- self._old_ec_wp)
+ self.do_reboot_action((self.set_ec_write_protect_and_reboot,
+ self._old_ec_wp))
self.wait_dev_screen_and_ctrl_d()
def press_ctrl_d(self, press_secs=''):