-minor customization to automated tests

This commit is contained in:
Martin Konecny 2011-11-22 12:22:34 -05:00
parent 72553a257d
commit e1cb11f53d
2 changed files with 5 additions and 4 deletions

View File

@ -58,7 +58,7 @@ def create_fresh_os(vm_name, update_virtualenv=False, debian=False):
then they will most likey have a different host key, and ssh will fail, warning
about a possible man in the middle attack.
"""
local("rm ~/.ssh/known_hosts")
local("rm -f ~/.ssh/known_hosts")
vm_vdi_file = '%s.vdi'%vm_name
vm_xml_file = '%s.xml'%vm_name
@ -103,7 +103,7 @@ def create_fresh_os(vm_name, update_virtualenv=False, debian=False):
local('VBoxManage snapshot %s restore fresh_install'%vm_name)
local('VBoxManage modifyvm "%s" --bridgeadapter1 eth0'%vm_name)
local('VBoxManage modifyvm "%s" --bridgeadapter1 wlan0'%vm_name)
local('VBoxManage startvm %s'%vm_name)
print "Please wait while attempting to acquire IP address"

View File

@ -4,8 +4,9 @@ exec 2>&1
target="airtime_git_branch"
#airtime_versions=("" "airtime_182_tar" "airtime_194_tar")
airtime_versions=("")
ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64")
airtime_versions=("" "airtime_182_tar" "airtime_195_tar")
#ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64")
ubuntu_versions=("ubuntu_natty_32" "ubuntu_natty_64")
num1=${#ubuntu_versions[@]}
num2=${#airtime_versions[@]}