client: fix console --loop on microcom error

In certain situation, e.g. if the serial port vanishes (i.e. on-board
FTDI chips on power off), microcom returns with 1 and:

  Got EOF from port
  connection lost

The loop should still continue, so do not raise an exception in this
case.

This uncovers another problem: if the corresponding place is released,
ser2net is stopped from the exporter and the port is set to None. Check
that after updating the resource to prevent a crude AssertionError later
due to an unavailable port.

Fixes: cdebb1c ("remote/client: return exit code for ssh/scp/rsync/telnet/video/audio/console")
Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

labgrid/remote/client.py

@@ -809,6 +809,10 @@ async def _console(self, place, target, timeout, *, logfile=None, loop=False, li
         # use zero timeout to prevent blocking sleeps
         target.await_resources([resource], timeout=0.0)
 
+        if not place.acquired:
+            print("place released")
+            return 255
+
         host, port = proxymanager.get_host_and_port(resource)
 
         # check for valid resources
@@ -852,11 +856,14 @@ async def console(self, place, target):
         while True:
             res = await self._console(place, target, 10.0, logfile=self.args.logfile,
                                       loop=self.args.loop, listen_only=self.args.listenonly)
-            if res:
-                exc = InteractiveCommandError("microcom error")
-                exc.exitcode = res
-                raise exc
+            # place released
+            if res == 255:
+                break
             if not self.args.loop:
+                if res:
+                    exc = InteractiveCommandError("microcom error")
+                    exc.exitcode = res
+                    raise exc
                 break
             await asyncio.sleep(1.0)
     console.needs_target = True