eCTS: Use proper methods to reset boards

This patch makes cts.py call reset_halt and resume instead of calling
send_openocd_commands directly.

BUG=none
BRANCH=none
TEST=Run util/run_ects.py.

Change-Id: I179fb73d41842b927fda81c153848887bb2dff57
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/553581
Reviewed-by: Randall Spangler <rspangler@chromium.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/cts/cts.py b/cts/cts.py
index 7781a2d8fc..0ef862d996 100755
--- a/cts/cts.py
+++ b/cts/cts.py
@@ -320,16 +320,16 @@ class Cts(object):
     # both boards must be rest and halted, with the th
     # resuming first, in order for the test suite to run in sync
     print 'Halting TH...'
-    if not self.th.send_open_ocd_commands(['init', 'reset halt']):
+    if not self.th.reset_halt():
       raise RuntimeError('Failed to halt TH')
     print 'Halting DUT...'
-    if not self.dut.send_open_ocd_commands(['init', 'reset halt']):
+    if not self.dut.reset_halt():
       raise RuntimeError('Failed to halt DUT')
     print 'Resuming TH...'
-    if not self.th.send_open_ocd_commands(['init', 'resume']):
+    if not self.th.resume():
       raise RuntimeError('Failed to resume TH')
     print 'Resuming DUT...'
-    if not self.dut.send_open_ocd_commands(['init', 'resume']):
+    if not self.dut.resume():
       raise RuntimeError('Failed to resume DUT')
 
     time.sleep(MAX_SUITE_TIME_SEC)
@@ -342,10 +342,10 @@ class Cts(object):
     self.th.close_tty()
 
     print 'Halting TH...'
-    if not self.th.send_open_ocd_commands(['init', 'reset halt']):
+    if not self.th.reset_halt():
       raise RuntimeError('Failed to halt TH')
     print 'Halting DUT...'
-    if not self.dut.send_open_ocd_commands(['init', 'reset halt']):
+    if not self.dut.reset_halt():
       raise RuntimeError('Failed to halt DUT')
 
     if not dut_output or not th_output: