sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-07 05:30:44 +00:00
Code Issues Releases Wiki Activity

Revert "target: add dry run for command execution"

Browse Source
This commit is contained in:
setrofim 2017-05-23 17:39:12 +01:00 committed by GitHub
parent 597231f3d5
commit b738655050
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devlib/target.py
View File

@ -145,10 +145,6 @@ class Target(object):
else: else:
return None return None
@property
def dryrun(self):
return self._dryrun
def __init__(self, def __init__(self,
connection_settings=None, connection_settings=None,
platform=None, platform=None,
@ -190,8 +186,6 @@ class Target(object):
self._cache = {} self._cache = {}
self._connections = {} self._connections = {}
self.busybox = None self.busybox = None
self._dryrun_enabled = False
self._dryrun = []
if load_default_modules: if load_default_modules:
module_lists = [self.default_modules] module_lists = [self.default_modules]
@ -317,20 +311,8 @@ class Target(object):
# execution # execution
def start_dryrun(self):
if not self._dryrun_enabled:
self._dryrun_enabled = True
self._dryrun = []
def stop_dryrun(self):
if self._dryrun_enabled:
self._dryrun_enabled = False
def execute(self, command, timeout=None, check_exit_code=True, as_root=False): def execute(self, command, timeout=None, check_exit_code=True, as_root=False):
if self._dryrun_enabled: return self.conn.execute(command, timeout, check_exit_code, as_root)
self._dryrun.append(command)
else:
return self.conn.execute(command, timeout, check_exit_code, as_root)
def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False): def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False):
return self.conn.background(command, stdout, stderr, as_root) return self.conn.background(command, stdout, stderr, as_root)

15
doc/target.rst
View File

@ -145,11 +145,6 @@ Target
thread. This will always be set to the connection for the current thread. This will always be set to the connection for the current
thread. thread.
.. attribute:: Target.dryrun
The accumulated dry-run commands. If dry-run mode is not active,
this will return the last accumulation list.
.. method:: Target.connect([timeout]) .. method:: Target.connect([timeout])
Establish a connection to the target. It is usually not necessary to call Establish a connection to the target. It is usually not necessary to call
@ -222,19 +217,9 @@ Target
:param timeout: timeout (in seconds) for the transfer; if the transfer does :param timeout: timeout (in seconds) for the transfer; if the transfer does
not complete within this period, an exception will be raised. not complete within this period, an exception will be raised.
.. method:: Target.start_dryrun()
Starts dry-run mode, making further calls to Target.execute() accumulate
commands in a list rather than executing them.
.. method:: Target.stop_dryrun()
Stops the dry-run mode.
.. method:: Target.execute(command [, timeout [, check_exit_code [, as_root]]]) .. method:: Target.execute(command [, timeout [, check_exit_code [, as_root]]])
Execute the specified command on the target device and return its output. Execute the specified command on the target device and return its output.
Command is not executed if dry-run mode is enabled.
:param command: The command to be executed. :param command: The command to be executed.
:param timeout: Timeout (in seconds) for the execution of the command. If :param timeout: Timeout (in seconds) for the execution of the command. If