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

Enable tests when mocking

Browse source
This commit is contained in:
Trotter Cashion 2012-07-02 16:53:36 -07:00
parent d0f947f07f
commit 29a7bef5e7
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
View file

@ -78,9 +78,8 @@ module Fog
data[:launch_configurations][launch_configuration_name] = { data[:launch_configurations][launch_configuration_name] = {
'BlockDeviceMappings' => [], 'BlockDeviceMappings' => [],
'CreatedTime' => Time.now.utc, 'CreatedTime' => Time.now.utc,
'IamInstanceProfile' => nil,
'ImageId' => image_id, 'ImageId' => image_id,
'InstanceMonitoring.Enabled' => true, 'InstanceMonitoring' => {'Enabled' => true},
'InstanceType' => instance_type, 'InstanceType' => instance_type,
'KernelId' => nil, 'KernelId' => nil,
'KeyName' => nil, 'KeyName' => nil,

19
lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb
View file

@ -35,20 +35,17 @@ module Fog
class Mock class Mock
def delete_auto_scaling_group(auto_scaling_group_name) def delete_auto_scaling_group(auto_scaling_group_name)
response = Excon::Response.new unless self.data[:auto_scaling_groups].delete(auto_scaling_group_name)
if data[:auto_scaling_groups].delete(auto_scaling_group_name) raise Fog::AWS::Autoscaling::NotFound, "The auto scaling group '#{auto_scaling_group_name}' does not exist."
response.status = true
response.body = {
'requestId' => Fog::AWS::Mock.request_id,
'return' => true
}
response
else
raise Fog::AWS::Autoscaling::NotFound.new("The auto scaling group '#{auto_scaling_group_name}' does not exist.")
end end
response = Excon::Response.new
response.status = 200
response.body = {
'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
}
response
end end
end end
end end

1
lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb
View file

@ -73,7 +73,6 @@ module Fog
def describe_auto_scaling_instances(options = {}) def describe_auto_scaling_instances(options = {})
results = { 'AutoScalingInstances' => [] } results = { 'AutoScalingInstances' => [] }
data[:auto_scaling_groups].each do |asg_name, asg_data| data[:auto_scaling_groups].each do |asg_name, asg_data|
lc_name = data[asg_data][lc_name]
asg_data['Instances'].each do |instance| asg_data['Instances'].each do |instance|
results['AutoScalingInstances'] << { results['AutoScalingInstances'] << {
'AutoScalingGroupName' => asg_name 'AutoScalingGroupName' => asg_name

6
tests/aws/requests/auto_scaling/auto_scaling_tests.rb
View file

@ -3,8 +3,6 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
@lc_name = 'fog-test-lc' @lc_name = 'fog-test-lc'
tests('success') do tests('success') do
pending if Fog.mocking?
tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do
Fog::AWS[:auto_scaling].describe_adjustment_types.body Fog::AWS[:auto_scaling].describe_adjustment_types.body
end end
@ -54,15 +52,19 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
end end
tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
pending if Fog.mocking?
Fog::AWS[:auto_scaling].describe_scaling_activities().body Fog::AWS[:auto_scaling].describe_scaling_activities().body
end end
tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
pending if Fog.mocking?
Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => '1').body
end end
tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
pending if Fog.mocking?
Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body Fog::AWS[:auto_scaling].describe_scaling_activities('ActivityIds' => ['1', '2']).body
end end
tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do tests("#describe_scaling_activities").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_ACTIVITIES) do
pending if Fog.mocking?
Fog::AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body Fog::AWS[:auto_scaling].describe_scaling_activities('AutoScalingGroupName' => @asg_name).body
end end