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

Minor fix.

Browse source
This commit is contained in:
Rupak Ganguly 2012-04-27 15:35:59 -04:00
parent 713c994b1c
commit c2be59d56e
5 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/hp/models/compute/address_tests.rb
View file

@ -1,10 +1,6 @@
Shindo.tests("Fog::Compute[:hp] | address", ['hp']) do
<<<<<<< HEAD
@base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
=======
@base_image_id = ENV["BASE_IMAGE_ID"] || 1242
>>>>>>> cs_auth
model_tests(Fog::Compute[:hp].addresses, {}, true) do

4
tests/hp/requests/compute/address_tests.rb
View file

@ -7,11 +7,7 @@ Shindo.tests('Fog::Compute[:hp] | address requests', ['hp']) do
'id' => Integer
}
<<<<<<< HEAD
@base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
=======
@base_image_id = ENV["BASE_IMAGE_ID"] || 1242
>>>>>>> cs_auth
tests('success') do

4
tests/hp/requests/compute/image_tests.rb
View file

@ -18,11 +18,7 @@ Shindo.tests('Fog::Compute[:hp] | image requests', ['hp']) do
'name' => String
}
<<<<<<< HEAD
@base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
=======
@base_image_id = ENV["BASE_IMAGE_ID"] || 1242
>>>>>>> cs_auth
tests('success') do
@server_name = "fogservertest"

4
tests/hp/requests/compute/server_address_tests.rb
View file

@ -1,10 +1,6 @@
Shindo.tests('Fog::Compute[:hp] | address requests', ['hp']) do
<<<<<<< HEAD
@base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
=======
@base_image_id = ENV["BASE_IMAGE_ID"] || 1242
>>>>>>> cs_auth
tests('success') do
@server = Fog::Compute[:hp].servers.create(:name => 'fogaddresstests', :flavor_id => 100, :image_id => @base_image_id)

4
tests/hp/requests/compute/server_tests.rb
View file

@ -34,11 +34,7 @@ Shindo.tests('Fog::Compute[:hp] | server requests', ['hp']) do
'output' => String
}
<<<<<<< HEAD
@base_image_id = ENV["BASE_IMAGE_ID"] ||= "1242"
=======
@base_image_id = ENV["BASE_IMAGE_ID"] || 1242
>>>>>>> cs_auth
tests('success') do