Merge pull request #1181 from jluebbe/usbloader-output

driver/usbloader: enable print_on_silent_log for subprocess calls
labgrid-project · May 16, 2023 · 2f00b39 · 2f00b39
2 parents acecf4c + 94c3437
commit 2f00b39
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/labgrid/driver/usbloader.py b/labgrid/driver/usbloader.py
@@ -42,7 +42,8 @@ def load(self, filename=None):
         mf.sync_to_resource()
 
         processwrapper.check_output(
-            self.loader.command_prefix + [self.tool, "0", mf.get_remote_path()]
+            self.loader.command_prefix + [self.tool, "0", mf.get_remote_path()],
+            print_on_silent_log=True
         )
 
 
@@ -79,7 +80,8 @@ def load(self, filename=None):
 
         processwrapper.check_output(
             self.loader.command_prefix +
-            [self.tool, "-p", str(self.loader.path), "-c", mf.get_remote_path()]
+            [self.tool, "-p", str(self.loader.path), "-c", mf.get_remote_path()],
+            print_on_silent_log=True
         )
 
 
@@ -120,7 +122,8 @@ def load(self, filename=None):
             try:
                 processwrapper.check_output(
                     self.loader.command_prefix +
-                    [self.tool, 'db', mf.get_remote_path()]
+                    [self.tool, 'db', mf.get_remote_path()],
+                    print_on_silent_log=True
                 )
                 break
             except subprocess.CalledProcessError:
@@ -137,7 +140,8 @@ def load(self, filename=None):
             try:
                 processwrapper.check_output(
                     self.loader.command_prefix +
-                    [self.tool, 'wl', '0x40', mf.get_remote_path()]
+                    [self.tool, 'wl', '0x40', mf.get_remote_path()],
+                    print_on_silent_log=True
                 )
                 break
             except subprocess.CalledProcessError:
@@ -180,7 +184,8 @@ def load(self, filename=None):
         cmd = ['-b', self.script] if self.script else []
 
         processwrapper.check_output(
-            self.loader.command_prefix + [self.tool] + cmd + [mf.get_remote_path()]
+            self.loader.command_prefix + [self.tool] + cmd + [mf.get_remote_path()],
+            print_on_silent_log=True
         )
 
 
@@ -225,5 +230,6 @@ def load(self, filename):
                 f"--bus={self.loader.busnum}",
                 f"--device={self.loader.devnum}",
                 mf.get_remote_path(),
-            ]
+            ],
+            print_on_silent_log=True
         )