From 7730be8d7ea98b88c4b0cc1df951965d584ac512 Mon Sep 17 00:00:00 2001 From: Donghoon Shin Date: Tue, 13 Dec 2016 11:34:16 +0900 Subject: Change private function _sdb_root_on to public function sdb_root_on Change-Id: I26f06520715d68f48584e478df13eccfbe479924 --- CHANGES.txt | 1 + debian/changelog | 1 + litmus/device/device.py | 8 +++++--- litmus/device/deviceartik10.py | 2 +- litmus/device/devicestandalone.py | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 27808bb..d928568 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -47,3 +47,4 @@ Version 0.3.3 11 Oct 2016 Version 0.3.4 21 Oct 2016 --------------------------- - Update flash method for tw1 to skip passing parameter 'flasher' +- Change private function _sdb_root_on to public function sdb_root_on diff --git a/debian/changelog b/debian/changelog index 6563309..bda0fa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ litmus (0.3.4-1) unstable; urgency=low * Update flash method for tw1 to skip passing parameter 'flasher' + * Change private function _sdb_root_on to public function sdb_root_on -- Donghoon Shin Fri, 21 Oct 2016 11:36:00 +0900 diff --git a/litmus/device/device.py b/litmus/device/device.py index 3a62151..811f14c 100644 --- a/litmus/device/device.py +++ b/litmus/device/device.py @@ -145,7 +145,7 @@ class device(object): self._login_uart_shell() self._set_sdb_deviceid() self._attach_sdb() - self._sdb_root_on() + self.sdb_root_on() return except KeyboardInterrupt: self.off(1) @@ -646,8 +646,10 @@ class device(object): """docstring for _detach_sdb""" pass - def _sdb_root_on(self): - """docstring for _sdb_root_on""" + def sdb_root_on(self): + """docstring for sdb_root_on""" + logging.debug('=================sdb root on for {}=================' + .format(self.get_name())) call('sdb -s {} root on'.format(self.get_id()).split(), timeout=10) time.sleep(0.5) diff --git a/litmus/device/deviceartik10.py b/litmus/device/deviceartik10.py index d8990c2..7f9c3c2 100644 --- a/litmus/device/deviceartik10.py +++ b/litmus/device/deviceartik10.py @@ -138,7 +138,7 @@ class deviceartik10(device): self._login_uart_shell() self._set_sdb_deviceid() self._attach_sdb() - self._sdb_root_on() + self.sdb_root_on() return except KeyboardInterrupt: raise Exception('Keyboard interrupt.') diff --git a/litmus/device/devicestandalone.py b/litmus/device/devicestandalone.py index 4b0d61e..99ed73f 100644 --- a/litmus/device/devicestandalone.py +++ b/litmus/device/devicestandalone.py @@ -79,7 +79,7 @@ class devicestandalone(device): self.start_sdb_server() if self.is_on(): - self._sdb_root_on() + self.sdb_root_on() self.run_cmd('reboot -f', timeout=20) wait_for_boot = booting_time if booting_time else self._booting_time for loop in range(wait_for_boot): @@ -87,7 +87,7 @@ class devicestandalone(device): .format(wait_for_boot - loop)) time.sleep(1) self.start_sdb_server() - self._sdb_root_on() + self.sdb_root_on() def off(self, powercut_delay=2): """ @@ -125,7 +125,7 @@ class devicestandalone(device): if not filenames: raise Exception('There\'s no file to flash.') try: - self._sdb_root_on() + self.sdb_root_on() self._acquire_global_lock() self.run_cmd('reboot -f download', timeout=20) time.sleep(waiting) -- cgit v1.2.3