rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-04 16:21:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #646 from imikushin/fix-test-05

Browse Source 
Wait for docker in test_05
This commit is contained in:
Ivan Mikushin
2015-11-12 22:07:03 +05:00
parent c11a0739dd 8251edc642
commit 4d798edd1b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/integration/rancherostest/test_05_custom_docker_in_persistent_console.py
View File

@@ -1,7 +1,6 @@
import pytest import pytest
import rancherostest.util as u import rancherostest.util as u
import subprocess import subprocess
import time
ssh_command = ['./scripts/ssh', '--qemu', '--key', './tests/integration/assets/test.key'] ssh_command = ['./scripts/ssh', '--qemu', '--key', './tests/integration/assets/test.key']
@@ -18,13 +17,13 @@ def test_system_docker_survives_custom_docker_install(qemu):
assert qemu is not None assert qemu is not None
u.wait_for_ssh(ssh_command) u.wait_for_ssh(ssh_command)
subprocess.check_call(ssh_command + ['curl', '-OL', subprocess.check_call(ssh_command + ['curl', '-OL',
'https://test.docker.com/builds/Linux/x86_64/docker-1.9.0-rc4'], 'https://get.docker.com/builds/Linux/x86_64/docker-1.9.0'],
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)
subprocess.check_call(ssh_command + ['chmod', '+x', '/home/rancher/docker-1.9.0-rc4'], subprocess.check_call(ssh_command + ['chmod', '+x', '/home/rancher/docker-1.9.0'],
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)
subprocess.check_call(ssh_command + ['sudo', 'ln', '-sf', '/home/rancher/docker-1.9.0-rc4', '/usr/bin/docker'], subprocess.check_call(ssh_command + ['sudo', 'ln', '-sf', '/home/rancher/docker-1.9.0', '/usr/bin/docker'],
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)
subprocess.check_call(ssh_command + ['sudo', 'system-docker', 'restart', 'docker'], subprocess.check_call(ssh_command + ['sudo', 'system-docker', 'restart', 'docker'],
@@ -32,7 +31,5 @@ def test_system_docker_survives_custom_docker_install(qemu):
subprocess.check_call(ssh_command + ['sudo', 'system-docker', 'version'], subprocess.check_call(ssh_command + ['sudo', 'system-docker', 'version'],
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)
time.sleep(3)
subprocess.check_call(ssh_command + ['docker', 'version'], u.wait_for_ssh(ssh_command)
stderr=subprocess.STDOUT, universal_newlines=True)