From 94cc17271efa71af532ccd624df552cc331dcd70 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Fri, 4 Sep 2015 08:56:19 +0100 Subject: [PATCH] sysfs_extractor: fixed pulled files verification. When no files are listed for one the specified directoris, the instrument checks whether there are any files in that directory on the device. If that directory itself does not exist; that will result in an error. This is now handled correctly. --- wlauto/instrumentation/misc/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wlauto/instrumentation/misc/__init__.py b/wlauto/instrumentation/misc/__init__.py index ff580f66..c831d068 100644 --- a/wlauto/instrumentation/misc/__init__.py +++ b/wlauto/instrumentation/misc/__init__.py @@ -166,7 +166,9 @@ class SysfsExtractor(Instrument): for paths in self.device_and_host_paths: after_dir = paths[self.AFTER_PATH] dev_dir = paths[self.DEVICE_PATH].strip('*') # remove potential trailing '*' - if not os.listdir(after_dir) and self.device.listdir(dev_dir): + if (not os.listdir(after_dir) and + self.device.file_exists(dev_dir) and + self.device.listdir(dev_dir)): self.logger.error('sysfs files were not pulled from the device.') self.device_and_host_paths.remove(paths) # Path is removed to skip diffing it for _, before_dir, after_dir, diff_dir in self.device_and_host_paths: