remote/client: Flush the console device only when needed

At present if a console device is used by a strategy driver it is then
removed by the client immediately afterwards. If the 'console' command
is used, this means that any console data is lost.

This is done so that the console device is release for microcom, so
move the logic in with the microcom logic. With the forthcoming internal
terminal, it will not be needed.

Signed-off-by: Simon Glass <sjg@chromium.org>

Author: sjg20

labgrid/remote/client.py

@@ -892,12 +892,6 @@ def _get_target(self, place):
                     strategy.force(self.args.initial_state)
                 logging.info("Transitioning into state %s", self.args.state)
                 strategy.transition(self.args.state)
-                # deactivate console drivers so we are able to connect with microcom later
-                try:
-                    con = target.get_active_driver("ConsoleProtocol")
-                    target.deactivate(con)
-                except NoDriverFoundError:
-                    pass
         else:
             target = Target(place.name, env=self.env)
             RemotePlace(target, name=place.name)
@@ -1032,6 +1026,13 @@ async def _console(self, place, target, timeout, *, logfile=None, loop=False, li
         name = self.args.name
         from ..resource import NetworkSerialPort
 
+        # deactivate console drivers so we are able to connect with microcom
+        try:
+            con = target.get_active_driver("ConsoleProtocol")
+            target.deactivate(con)
+        except NoDriverFoundError:
+            pass
+
         resource = target.get_resource(NetworkSerialPort, name=name, wait_avail=False)
 
         # async await resources