Merge pull request #1676 from Bastian-Krause/bst/fix-error-messages

Fix Messages with Unevaluated Variables

Author: Bastian-Krause

labgrid/driver/power/mfi_mpower.py

@@ -91,7 +91,7 @@ def power_get(host, port, index):
         elif port['output'] == 1:
             return True
         else:
-            raise ExecutionError("unexpected port output value: '{port['output']}'")
+            raise ExecutionError(f"unexpected port output value: '{port['output']}'")
     else:
         raise ExecutionError(f"unexpected http response: code {r.status_code}, content type '{r.headers['Content-Type']}' and content: '{r.text}'")
 

labgrid/remote/coordinator.py

@@ -626,7 +626,7 @@ async def _acquire_resource(self, place, resource):
         self.get_exporter_by_name(resource.path[0]).queue.put_nowait(cmd)
         await cmd.wait()
         if not cmd.response.success:
-            raise ExporterError("failed to acquire {resource} ({cmd.response.reason})")
+            raise ExporterError(f"failed to acquire {resource} ({cmd.response.reason})")
         if resource.acquired != place.name:
             logging.warning("resource %s not acquired by this place after acquire request", resource)
 

tests/conftest.py

@@ -55,7 +55,7 @@ def __init__(self, cwd):
         self.reader = None
 
     def stop(self):
-        logging.info("stopping {self.__class__.__name__} pid=%s", self.spawn.pid)
+        logging.info("stopping %s pid=%s", self.__class__.__name__, self.spawn.pid)
 
         # let coverage write its data:
         # https://coverage.readthedocs.io/en/latest/subprocess.html#process-termination