rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-17 14:28:16 +00:00
Code Issues Releases Wiki Activity

clear state before running tests, wait for ssh

Browse Source
This commit is contained in:
Ivan Mikushin 2015-05-08 11:51:15 +05:00
parent f2d797d6cc
commit 05609ca6fb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/integration/rancherostest/test_system.py
View File

@ -5,6 +5,9 @@ import time
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def qemu(request): def qemu(request):
subprocess.check_call('rm ./state/*', shell=True)
print('\nrm ./state/*')
print('\nStarting QEMU')
p = subprocess.Popen('./scripts/run', stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) p = subprocess.Popen('./scripts/run', stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
def fin(): def fin():
@ -16,7 +19,7 @@ def qemu(request):
return p return p
@pytest.mark.timeout(20) @pytest.mark.timeout(30)
def test_system_boot(qemu): def test_system_boot(qemu):
for ln in iter(qemu.stdout.readline, ''): for ln in iter(qemu.stdout.readline, ''):
ros_booted_substr = str.find(ln, 'RancherOS v0.3.1-rc2 started') # TODO use ./scripts/version ros_booted_substr = str.find(ln, 'RancherOS v0.3.1-rc2 started') # TODO use ./scripts/version
@ -27,10 +30,16 @@ def test_system_boot(qemu):
assert False assert False
@pytest.mark.timeout(10)
def wait_for_ssh():
while subprocess.call(['./scripts/ssh', '/bin/true']) != 0:
time.sleep(1)
@pytest.mark.timeout(40) @pytest.mark.timeout(40)
def test_run_system_container(qemu): def test_run_system_container(qemu):
assert qemu.returncode is None assert qemu.returncode is None
time.sleep(2) # or else ssh will fail (WTF?!) wait_for_ssh()
ssh = subprocess.Popen( ssh = subprocess.Popen(
'./scripts/ssh sudo system-docker run --rm busybox /bin/true', shell=True, './scripts/ssh sudo system-docker run --rm busybox /bin/true', shell=True,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)