rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-23 13:37:03 +00:00
Code Issues Releases Wiki Activity

tweak tests

Browse Source
This commit is contained in:
Ivan Mikushin 2015-12-11 17:38:00 +05:00
parent f03486263b
commit 084fb43201
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run
View File

@ -174,7 +174,7 @@ if [ "$XHYVE" == "1" ] || [ "$QEMU" == "1" ]; then
-net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher-dev \ -net user,vlan=0,hostfwd=tcp::2222-:22,hostname=rancher-dev \
-drive if=virtio,file=${HD} \ -drive if=virtio,file=${HD} \
${KVM_ENABLE} \ ${KVM_ENABLE} \
-smp 4 \ -smp 1 \
-cdrom ${CLOUD_CONFIG_ISO} \ -cdrom ${CLOUD_CONFIG_ISO} \
-append "${KERNEL_ARGS}" \ -append "${KERNEL_ARGS}" \
-nographic \ -nographic \

2
tests/integration/rostest/test_01_cloud_config.py
View File

@ -75,7 +75,7 @@ def test_docker_tls_args(qemu, cloud_config):
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)
subprocess.check_call( subprocess.check_call(
ssh_command + ['docker', '--tlsverify', '-H', '127.0.0.1:2376', 'version'], ssh_command + ['docker', '--tlsverify', 'version'],
stderr=subprocess.STDOUT, universal_newlines=True) stderr=subprocess.STDOUT, universal_newlines=True)