remote/client: cleanup InteractiveCommandError

When handling InteractiveCommandError there is an implicit assumption
that it has a field `exitcode`.
This assumption holds since in all places it is raised there is the same
repeated code block.

Make this assumption more explicit by providing a proper constructor to
InteractiveCommandError class.

Signed-off-by: Sebastian Gross <[email protected]>

Author: sbngross

labgrid/remote/client.py

@@ -69,7 +69,9 @@ class ServerError(Error):
 
 
 class InteractiveCommandError(Error):
-    pass
+    def __init__(self: Error, msg: str, exitcode: int):
+        super(InteractiveCommandError, self).__init__(msg)
+        self.exitcode = exitcode
 
 
 @attr.s(eq=False)
@@ -1049,9 +1051,7 @@ async def console(self, place, target):
                 break
             if not self.args.loop:
                 if res:
-                    exc = InteractiveCommandError("microcom error")
-                    exc.exitcode = res
-                    raise exc
+                    raise InteractiveCommandError("microcom error", res)
                 break
             await asyncio.sleep(1.0)
 
@@ -1251,27 +1251,21 @@ def ssh(self):
 
         res = drv.interact(self.args.leftover)
         if res:
-            exc = InteractiveCommandError("ssh error")
-            exc.exitcode = res
-            raise exc
+            raise InteractiveCommandError("ssh error", res)
 
     def scp(self):
         drv = self._get_ssh()
 
         res = drv.scp(src=self.args.src, dst=self.args.dst)
         if res:
-            exc = InteractiveCommandError("scp error")
-            exc.exitcode = res
-            raise exc
+            raise InteractiveCommandError("scp error", res)
 
     def rsync(self):
         drv = self._get_ssh()
 
         res = drv.rsync(src=self.args.src, dst=self.args.dst, extra=self.args.leftover)
         if res:
-            exc = InteractiveCommandError("rsync error")
-            exc.exitcode = res
-            raise exc
+            raise InteractiveCommandError("rsync error", res)
 
     def sshfs(self):
         drv = self._get_ssh()
@@ -1309,9 +1303,7 @@ def telnet(self):
         args = ["telnet", str(ip)]
         res = subprocess.call(args)
         if res:
-            exc = InteractiveCommandError("telnet error")
-            exc.exitcode = res
-            raise exc
+            raise InteractiveCommandError("telnet error", res)
 
     def video(self):
         place = self.get_acquired_place()
@@ -1347,9 +1339,7 @@ def video(self):
         else:
             res = drv.stream(quality, controls=controls)
             if res:
-                exc = InteractiveCommandError("gst-launch-1.0 error")
-                exc.exitcode = res
-                raise exc
+                raise InteractiveCommandError("gst-launch-1.0 error", res)
 
     def audio(self):
         place = self.get_acquired_place()
@@ -1358,9 +1348,7 @@ def audio(self):
         drv = self._get_driver_or_new(target, "USBAudioInputDriver", name=name)
         res = drv.play()
         if res:
-            exc = InteractiveCommandError("gst-launch-1.0 error")
-            exc.exitcode = res
-            raise exc
+            raise InteractiveCommandError("gst-launch-1.0 error", res)
 
     def _get_tmc(self):
         place = self.get_acquired_place()