diff options
| author | setrofim <setrofim@gmail.com> | 2017-10-10 08:35:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 08:35:03 +0100 |
| commit | 4d269774f7087bcf9f6c53deb0dbe6a3503d821b (patch) | |
| tree | 716b7692e44e0fb95ff68b78b8458e784b6c748c | |
| parent | 34e7e4c89534235ec30b8ba217d4fbf1bfaf724e (diff) | |
| parent | 8a0554faab92b6d1ff30a124a24312a8e126b134 (diff) | |
| download | devlib-4d269774f7087bcf9f6c53deb0dbe6a3503d821b.tar.gz | |
Merge pull request #187 from bjackman/clear-logcat-lock
AndroidTarget: prevent concurrent invocations of 'logcat -c'
| -rw-r--r-- | devlib/target.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/devlib/target.py b/devlib/target.py index 81629b1..b2cfd2f 100644 --- a/devlib/target.py +++ b/devlib/target.py @@ -950,6 +950,7 @@ class AndroidTarget(Target): shell_prompt=shell_prompt, conn_cls=conn_cls) self.package_data_directory = package_data_directory + self.clear_logcat_lock = threading.Lock() def reset(self, fastboot=False): # pylint: disable=arguments-differ try: @@ -1182,7 +1183,8 @@ class AndroidTarget(Target): adb_command(self.adb_name, command, timeout=timeout) def clear_logcat(self): - adb_command(self.adb_name, 'logcat -c', timeout=30) + with self.clear_logcat_lock: + adb_command(self.adb_name, 'logcat -c', timeout=30) def get_logcat_monitor(self, regexps=None): return LogcatMonitor(self, regexps) |