1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

fix some small bugs in the gce smoke tests

This commit is contained in:
Nat Welch 2013-07-25 12:22:12 -07:00
parent 01f4c0f7bf
commit 07caa0fba6
2 changed files with 10 additions and 9 deletions

View file

@ -4,11 +4,11 @@ def test
server = connection.servers.create(defaults = { server = connection.servers.create(defaults = {
:name => "fog-smoke-test-#{Time.now.to_i}", :name => "fog-smoke-test-#{Time.now.to_i}",
:image_name => "debian-7-wheezy-v20130522", :image_name => "debian-7-wheezy-v20130522",
:machine_type => "n1-standard-1", :machine_type => "n1-standard-1",
:zone_name => "us-central1-a", :zone_name => "us-central1-a",
:private_key_path => File.expand_path("~/.ssh/id_rsa"), :private_key_path => File.expand_path("~/.ssh/id_rsa"),
:public_key_path => File.expand_path("~/.ssh/id_rsa.pub"), :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
:user => ENV['USER'], :user => ENV['USER'],
}) })
# My own wait_for because it hides errors # My own wait_for because it hides errors
@ -19,7 +19,9 @@ def test
until server.sshable? || duration > timeout until server.sshable? || duration > timeout
# puts duration # puts duration
# puts " ----- " # puts " ----- "
# p server.reload
server.reload
# p "ready?: #{server.ready?}" # p "ready?: #{server.ready?}"
# p "public_ip_address: #{server.public_ip_address.inspect}" # p "public_ip_address: #{server.public_ip_address.inspect}"
# p "public_key: #{server.public_key.inspect}" # p "public_key: #{server.public_key.inspect}"

View file

@ -1,10 +1,9 @@
def test def test
connection = Fog::Compute.new({ :provider => "Google" }) connection = Fog::Compute.new({ :provider => "Google" })
time = Time.now.utc.to_i time = Time.now.utc.to_i
disk = CONNECTION.disks.create({:name => 'foggydisk', :size => 10, :zone_name => 'us-central1-a', :image_name => 'centos-6-v20130522'}) disk = connection.disks.create({:name => 'foggydisk', :size => 10, :zone_name => 'us-central1-a', :image_name => 'centos-6-v20130522'})
disk.wait_for { disk.ready? } disk.wait_for { disk.ready? }
puts 'disk ready'
disk = disk.get_as_boot_disk(true) disk = disk.get_as_boot_disk(true)
params = { params = {
:name => "fog-smoke-test-#{Time.now.to_i}", :name => "fog-smoke-test-#{Time.now.to_i}",
@ -15,7 +14,7 @@ def test
:user => ENV['USER'] :user => ENV['USER']
} }
server = CONNECTION.servers.bootstrap params server = connection.servers.bootstrap params
raise "Could not bootstrap sshable server." unless server.ssh("whoami") raise "Could not bootstrap sshable server." unless server.ssh("whoami")
raise "Could not delete server." unless server.destroy raise "Could not delete server." unless server.destroy