diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-09-20 14:01:12 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-09-20 14:01:12 +0200 |
| commit | 9f32eb4563cccd6ab3b5d58370e675b79066bf9d (patch) | |
| tree | 796e2ee86b9aad870fb659d36d066eb3311556c8 | |
| parent | 0d6eec1b021ac90f59e895f193b9813211bc9930 (diff) | |
| download | rumba-9f32eb4563cccd6ab3b5d58370e675b79066bf9d.tar.gz rumba-9f32eb4563cccd6ab3b5d58370e675b79066bf9d.zip | |
testbeds: qemu: Remove unneeded sleep
This removes a sleep in the QEMU testbed that was giving errors. It
also catches another error in the SSH support.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | rumba/ssh_support.py | 2 | ||||
| -rw-r--r-- | rumba/testbeds/qemu.py | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10bf999..1f8d116 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,4 +6,4 @@ before_script: irati-test: script: - - python examples/vpn.py
\ No newline at end of file + - python examples/vpn.py diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 8b07c13..9c24890 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -67,7 +67,7 @@ def ssh_connect(ssh_client, hostname, port, username, password, time_out, ssh_client.connect(hostname, port, username, password, look_for_keys=True, timeout=time_out, sock=proxy) return - except paramiko.ssh_exception.SSHException: + except (paramiko.ssh_exception.SSHException, EOFError): retry += 1 logger.error('Failed to connect to host, retrying: ' + str(retry) + '/' + str(max_retries) + ' retries') diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index 4d6804d..5c8c7b3 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -187,8 +187,6 @@ class Testbed(mod.Testbed): 'brctl addif %(br)s %(tap)s' % {'tap': tap_id, 'br': shim.name} ).split('\n') - command_list += ['sleep 15'] - if shim.link_speed > 0: speed = '%dmbit' % shim.link_speed |