fog-maestrodev 1.14.0.20130806165225 → 1.15.0.20130829165835

data/tests/rackspace/requests/load_balancers/helper.rb

@@ -32,6 +32,15 @@ LOAD_BALANCER_USAGE_FORMAT = {
   ]
 }
 
+LOAD_BALANCER_STATS_FORMAT = {
+    'connectTimeOut' => Integer,
+    'connectError' => Integer,
+    'connectFailure' => Integer,
+    'dataTimedOut' => Integer,
+    'keepAliveTimedOut' => Integer,
+    'maxConn' => Integer
+}
+
 SSL_TERMINATION_FORMAT = {
   'sslTermination' => {
     'certificate' => String,

data/tests/rackspace/requests/monitoring/alarm_tests.rb

@@ -36,11 +36,10 @@ Shindo.tests('Fog::Rackspace::Monitoring | alarm_tests', ['rackspace','rackspace
     tests('#fail to create new alarm(-1)').raises(Fog::Rackspace::Monitoring::BadRequest) do
       account.create_alarm(entity_id, {:type => ""})
     end
-    # Commenting out update because incorrect update throws a 502
-    #tests('#fail to update invalid alarm(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
-      #options = { :testing => "Bar" }
-      #response = account.update_alarm(-1,-1,options)
-    #end
+    tests('#fail to update invalid alarm(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
+      options = { :testing => "Bar" }
+      response = account.update_alarm(-1,-1,options)
+    end
     tests('#fail to list alarms').raises(Fog::Rackspace::Monitoring::NotFound) do
       account.list_alarms(-1)
     end

data/tests/rackspace/requests/monitoring/entity_tests.rb

@@ -1,9 +1,9 @@
 Shindo.tests('Fog::Rackspace::Monitoring | entity_tests', ['rackspace','rackspace_monitoring']) do
-  pending if Fog.mocking? 
   account = Fog::Rackspace::Monitoring.new
   entity_id = nil
   tests('success') do
     tests('#create new entity').formats(DATA_FORMAT) do
+      pending if Fog.mocking?
       response = account.create_entity(:label => "Foo").data
       entity_id = response[:headers]["X-Object-ID"]
       response
@@ -12,25 +12,33 @@ Shindo.tests('Fog::Rackspace::Monitoring | entity_tests', ['rackspace','rackspac
       account.get_entity(entity_id).data[:headers]
     end
     tests('#update entity').formats(DATA_FORMAT) do
+      pending if Fog.mocking?
+
       options = { :testing => "Bar"}
       account.update_entity(entity_id,options).data
     end
     tests('#delete entity').formats(DELETE_DATA_FORMAT) do
+      pending if Fog.mocking?
       account.delete_entity(entity_id).data
     end
   end
   tests('failure') do
     tests('#create new entity(-1)').raises(Fog::Rackspace::Monitoring::BadRequest) do
+      pending if Fog.mocking?
       account.create_entity(:label => "")
     end
     tests('#get entity(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
+      pending if Fog.mocking?
+
       account.get_entity(-1)
     end
     tests('#update invalid entity(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
+      pending if Fog.mocking?
       options = { :testing => "Bar" }
       response = account.update_entity(-1,options)
     end
     tests('#delete entity(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
+      pending if Fog.mocking?
       account.delete_entity(-1)
     end
   end

data/tests/rackspace/requests/storage/large_object_tests.rb

@@ -304,12 +304,20 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
         end
       end
 
-      tests('#delete_static_large_object with missing container').raises(Fog::Storage::Rackspace::NotFound) do
-        Fog::Storage[:rackspace].delete_static_large_object('fognoncontainer', 'fog_large_object')
+      tests('#delete_static_large_object with missing container') do
+        response = Fog::Storage[:rackspace].delete_static_large_object('fognoncontainer', 'fog_large_object')
+        returns(200) { response.status }
+        returns(0) { response.body["Number Not Found"] }
+        returns("400 Bad Request") { response.body["Response Status"]}
+        returns("Invalid bulk delete.") { response.body["Response Body"]}
       end
 
-      tests('#delete_static_large_object with missing manifest').raises(Fog::Storage::Rackspace::NotFound) do
-        Fog::Storage[:rackspace].delete_static_large_object(@directory.identity, 'fog_non_object')
+      tests('#delete_static_large_object with missing manifest') do
+        response = Fog::Storage[:rackspace].delete_static_large_object(@directory.identity, 'fog_non_object')
+        returns(200) { response.status }
+        returns(0) { response.body["Number Not Found"] }
+        returns("400 Bad Request") { response.body["Response Status"]}
+        returns("Invalid bulk delete.") { response.body["Response Body"]}
       end
 
       tests('#delete_static_large_object with missing segment') do

data/tests/rackspace/storage_tests.rb

@@ -102,15 +102,34 @@ Shindo.tests('Rackspace | Storage', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Storage::Rackspace.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad-token")
-    returns(204) { @service.head_containers.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Storage::Rackspace.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(204) { @service.head_containers.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Storage::Rackspace.new :rackspace_api_key => 'bad_key' }
+    end
   end
     
   tests('account').succeeds do
     pending if Fog.mocking?    
      Fog::Storage[:rackspace].account
   end
+
+  tests('ssl') do
+    tests('ssl enabled') do
+      @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => true)
+      returns(true) { @service.ssl? }
+    end
+    tests('ssl disabled') do
+      @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => false)
+      returns(false) { @service.ssl? }
+
+      @service = Fog::Storage::Rackspace.new(:rackspace_cdn_ssl => nil)
+      returns(false) { @service.ssl? }
+    end
+  end
 end
 

data/tests/rackspace/url_encoding_tests.rb

@@ -1,3 +1,5 @@
 Shindo.tests('Rackspace | url_encoding', ['rackspace']) do
-  returns( Fog::Rackspace.escape( "is this my file?.jpg" ) ) { "is%20this%20my%20file%3F.jpg" }
+  returns("is%20this%20my%20file%3F.jpg") { Fog::Rackspace.escape("is this my file?.jpg") }
+  returns("foo/bar") { Fog::Rackspace.escape("foo/bar", "/") }
+  returns("foo%2Fbar") { Fog::Rackspace.escape("foo/bar", "0") }
 end