Merge pull request #1667 from SmithChart/sshdriver

SSHDriver: Fix Timeout handling on start_own_master()

Author: Emantor

labgrid/driver/sshdriver.py

@@ -97,13 +97,11 @@ def _start_own_master(self):
         # connection refused during target startup
         connect_timeout = round(timeout.remaining)
         while True:
-            if connect_timeout == 0:
-                raise Exception("Timeout while waiting for ssh connection")
             try:
                 return self._start_own_master_once(connect_timeout)
             except ExecutionError as e:
                 if timeout.expired:
-                    raise e
+                    raise Exception("Timeout while waiting for ssh connection") from e
                 time.sleep(0.5)
                 connect_timeout = round(timeout.remaining)