← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

(spiv) Fix random test_bad_connection_ssh failures (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
377
377
            return SFTPClient(SocketAsChannelAdapter(sock))
378
378
        except _sftp_connection_errors, e:
379
379
            self._raise_connection_error(host, port=port, orig_error=e)
380
 
        except (OSError, IOError), e:
 
380
        except (OSError, IOError, socket.error), e:
381
381
            # If the machine is fast enough, ssh can actually exit
382
382
            # before we try and send it the sftp request, which
383
383
            # raises a Broken Pipe
392
392
            return self._connect(argv)
393
393
        except (EOFError), e:
394
394
            self._raise_connection_error(host, port=port, orig_error=e)
395
 
        except (OSError, IOError), e:
 
395
        except (OSError, IOError, socket.error), e:
396
396
            # If the machine is fast enough, ssh can actually exit
397
397
            # before we try and send it the sftp request, which
398
398
            # raises a Broken Pipe