fog 1.19.0 → 1.20.0

data/tests/rackspace/models/queues/claims_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -16,7 +14,7 @@ Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
   }
 
   begin
-    collection_tests(queue.claims, params, false)
+    collection_tests(queue.claims, params)
 
     tests('creating claims when there are no messages') do
 

data/tests/rackspace/models/queues/message_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_instance_#{Time.now.to_i.to_s}",
@@ -11,7 +9,7 @@ Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
     :body => { :key => 'value' }
   }
   begin
-    model_tests(queue.messages, options, false) do
+    model_tests(queue.messages, options) do
       tests('#href').returns(true) do
         !@instance.href.nil?
       end

data/tests/rackspace/models/queues/messages_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   queue = service.queues.create({
     :name => "fog_queue_#{Time.now.to_i.to_s}",
@@ -12,7 +10,7 @@ Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
     :body => "blah"
   }
 
-  collection_tests(queue.messages, options, false)
+  collection_tests(queue.messages, options)
 
   queue.destroy
 end

data/tests/rackspace/models/queues/queue_tests.rb

@@ -1,12 +1,10 @@
 Shindo.tests('Fog::Rackspace::Queues | queue', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
-  model_tests(service.queues, options, false) do
+  model_tests(service.queues, options) do
 
     tests('#stats').formats(QUEUE_STATS_FORMAT['messages']) do
       @instance.stats

data/tests/rackspace/models/queues/queues_tests.rb

@@ -1,10 +1,8 @@
 Shindo.tests('Fog::Rackspace::Queues | queues', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
   options = {
     :name => "fog_instance_#{Time.now.to_i.to_s}",
   }
-  collection_tests(service.queues, options, false)
+  collection_tests(service.queues, options)
 end

data/tests/rackspace/models/storage/account_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Storage | account', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @account = Fog::Storage[:rackspace].account
 
   tests('load') do

data/tests/rackspace/models/storage/directories_tests.rb

@@ -1,10 +1,7 @@
 Shindo.tests('Fog::Rackspace::Storage | directories', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @service = Fog::Storage[:rackspace]
 
-
   begin
     @name = "fog-directories-test-#{Time.now.to_i.to_s}"
     @filename = 'lorem.txt'    

data/tests/rackspace/models/storage/directory_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('Fog::Rackspace::Storage | directory', ['rackspace']) do
 
-  pending if Fog.mocking?
-
   @service = Fog::Storage[:rackspace]
   
   def container_meta_attributes
@@ -92,9 +90,8 @@ Shindo.tests('Fog::Rackspace::Storage | directory', ['rackspace']) do
 
    directory_attributes[:metadata] = {:draft => 'true'}
 
-   tests('metadata')  do
-     pending if Fog.mocking?
-     
+   tests('metadata') do
+
      model_tests(@service.directories, directory_attributes, Fog.mocking?) do
        tests('sets metadata on create').returns('true') do
          @instance.metadata.data

data/tests/rackspace/models/storage/file_tests.rb

@@ -30,8 +30,6 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
     end
   end
 
-  pending if Fog.mocking?
-
   def object_attributes(file=@instance)
     @instance.service.head_object(@directory.key, file.key).headers
   end
@@ -280,6 +278,55 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
 
     end
 
+    tests("#delete_at") do
+      tests("#delete_at should default to nil").returns(nil) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = 1
+      @instance.save
+      tests("#delete_at should return delete_at attribute").returns(1) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = 1
+      @instance.save
+      tests("#delete_at= should update delete_at").returns(2) do
+        @instance.delete_at = 2
+        @instance.save
+        @instance.delete_at
+      end
+
+      tests("#delete_at= should not blow up on nil") do
+        @instance.delete_at = nil
+        @instance.save
+      end
+    end
+
+    tests("#delete_after") do
+      tests("#delete_after should default to nil").returns(nil) do
+        @instance.delete_after
+      end
+
+      @instance.delete_after = 1
+      @instance.save
+      tests("#delete_after should return delete_after attribute").returns(1) do
+        @instance.delete_after
+      end
+
+      @instance.delete_after = 1
+      @instance.save
+      tests("#delete_after= should update delete_after").returns(2) do
+        @instance.delete_after = 2
+        @instance.save
+        @instance.delete_after
+      end
+
+      tests("#delete_after= should not blow up on nil") do
+        @instance.delete_after = nil
+        @instance.save
+      end
+    end
   end
 
 

data/tests/rackspace/models/storage/files_tests.rb

@@ -12,8 +12,7 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do
 
 
   tests('success') do
-    pending if Fog.mocking?
-    collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, false)
+    collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, Fog.mocking?)
 
     @service = Fog::Storage.new :provider => 'rackspace', :rackspace_temp_url_key => "my_secret"
 
@@ -25,13 +24,11 @@ Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do
     end
 
     tests("#get_http_url('#{@directory.key}')").succeeds do
-      pending if Fog.mocking?
       expire_time = Time.now + 3600
       @directory.files.get_http_url(@file.key, expire_time)
     end
 
     tests("#get_https_url('#{@directory.key}', '#{@file.key}')").succeeds do
-      pending if Fog.mocking?
       expire_time = Time.now + 3600
       @directory.files.get_https_url(@file.key, expire_time)
     end

data/tests/rackspace/queues_tests.rb

@@ -1,8 +1,5 @@
 Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
 
-  pending if Fog.mocking?
-
-
   def assert_method(url, method)
     @service.instance_variable_set "@rackspace_auth_url", url
     returns(method) { @service.send :authentication_method }
@@ -25,16 +22,12 @@ Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
   end
 
   tests('authentication v1') do
-    pending if Fog.mocking?
-
     raises(Fog::Errors::NotImplemented) do
       @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
     end
   end
 
   tests('authentication v2') do
-    pending if Fog.mocking?
-
     tests('variables populated').succeeds do
       @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
@@ -63,8 +56,6 @@ Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
   end
 
   tests('default auth') do
-    pending if Fog.mocking?
-
     tests('no params').succeeds do
       #We consistently use DFW as our default but queues doesn't have a DFW default region yet.
       # We can enable this test once they have a DFW region (which they will)
@@ -83,8 +74,6 @@ Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
   end
 
   tests('reauthentication') do
-    pending if Fog.mocking?
-
     @service = Fog::Rackspace::Queues.new
     returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
     @service.instance_variable_set("@auth_token", "bad_token")
@@ -99,8 +88,6 @@ Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
   end
 
   tests('client_id') do
-    pending if Fog.mocking?
-
     tests('should generate uuid if a client id is not provided').succeeds do
       pending unless Fog::UUID.supported?
       service = Fog::Rackspace::Queues.new

data/tests/rackspace/requests/identity/token_tests.rb

@@ -1,7 +1,4 @@
 Shindo.tests('Fog::Rackspace::Identity | tokens', ['rackspace']) do
-
-  pending if Fog.mock?
-
   ROLE_FORMAT = {
     'id' => String,
     'name' => String,
@@ -55,6 +52,7 @@ Shindo.tests('Fog::Rackspace::Identity | tokens', ['rackspace']) do
     end
 
     tests('uses connection options').returns(true) do
+      pending if Fog.mocking?
       identity_service = Fog::Rackspace::Identity.new(:connection_options => { :ssl_verify_peer => true })
 
       connection = identity_service.instance_variable_get("@connection")

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

@@ -3,6 +3,8 @@ Shindo.tests('Fog::Rackspace::Monitoring | agent_tests', ['rackspace','rackspace
   account = Fog::Rackspace::Monitoring.new
   agent_token = nil
   options = { "label" => "Bar" }
+  values_format = Hash
+  
   tests('success') do
     tests('#create new agent token').formats(DATA_FORMAT) do
       response = account.create_agent_token(options).data
@@ -12,13 +14,47 @@ Shindo.tests('Fog::Rackspace::Monitoring | agent_tests', ['rackspace','rackspace
     tests('#list agent tokens').formats(LIST_HEADERS_FORMAT) do
       account.list_agent_tokens().data[:headers]
     end
+    tests("#list_agents") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.list_agents.body }
+    end     
+    tests("#get_agent") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_agent("agent_id").body }
+    end
+
+
     tests('#get agent token').formats(LIST_HEADERS_FORMAT) do
       account.get_agent_token(agent_token).data[:headers]
     end
     tests('#delete agent token').formats(DELETE_HEADERS_FORMAT) do
       account.delete_agent_token(agent_token).data[:headers]
     end
+    tests("#get_cpus_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_cpus_info("agent_id").body }
+    end
+    tests("#get_disks_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_disks_info("agent_id").body }
+    end
+    tests("#get_filesystems_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_filesystems_info("agent_id").body }
+    end
+    tests("#get_logged_in_user_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_logged_in_user_info("agent_id").body }
+    end
+    tests("#get_memory_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_memory_info("agent_id").body }
+    end
+    tests("#get_network_interfaces_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_network_interfaces_info("agent_id").body }
+    end
+    tests("#get_processes_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_processes_info("agent_id").body }
+    end
+    tests("#get_system_info") do
+    	data_matches_schema(values_format, {:allow_extra_keys => true}) { account.get_system_info("agent_id").body }
+    end   
+    
   end
+
   tests('failure') do
     tests('#fail to create agent token(-1)').raises(TypeError) do
       account.create_agent_token(-1)
@@ -29,5 +65,11 @@ Shindo.tests('Fog::Rackspace::Monitoring | agent_tests', ['rackspace','rackspace
     tests('#fail to delete agent token(-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
       account.delete_agent_token(-1)
     end
+    tests('#fail to connect to agent(-1)').raises(Fog::Rackspace::Monitoring::BadRequest) do
+      account.get_cpus_info(-1)
+    end
+    tests('#fail to get agent (-1)').raises(Fog::Rackspace::Monitoring::NotFound) do
+      account.get_agent(-1)
+    end    
   end
 end

data/tests/rackspace/requests/queues/claim_tests.rb

@@ -1,6 +1,4 @@
-  Shindo.tests('Fog::Rackspace::Queues | claim_tests', ['rackspace']) do
-
-  pending if Fog.mocking?
+Shindo.tests('Fog::Rackspace::Queues | claim_tests', ['rackspace']) do
 
   service = Fog::Rackspace::Queues.new
 

data/tests/rackspace/requests/queues/messages_tests.rb

@@ -1,7 +1,4 @@
 Shindo.tests('Fog::Rackspace::Queues | messages_tests', ['rackspace']) do
-
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
 
   queue_name = 'fog' + Time.now.to_i.to_s
@@ -11,10 +8,7 @@ Shindo.tests('Fog::Rackspace::Queues | messages_tests', ['rackspace']) do
   service.create_queue(queue_name)
 
   begin
-
     tests('success') do
-
-
       tests("#list_message(#{client_id}, #{queue_name}, {:echo => true}) => No Content").returns(204) do
         service.list_messages(client_id, queue_name, {:echo => true}).status
       end

data/tests/rackspace/requests/queues/queues_tests.rb

@@ -1,11 +1,7 @@
 Shindo.tests('Fog::Rackspace::Queues | queue_tests', ['rackspace']) do
-
-  pending if Fog.mocking?
-
   service = Fog::Rackspace::Queues.new
 
   tests('success') do
-
     queue_name = 'fog' + Time.now.to_i.to_s
 
     tests("#create_queue(#{queue_name})").succeeds do
@@ -38,6 +34,5 @@ Shindo.tests('Fog::Rackspace::Queues | queue_tests', ['rackspace']) do
     tests("#get_queue('nonexistentqueue') => Does not exist").raises(Fog::Rackspace::Queues::NotFound) do
       service.get_queue('nonexistentqueue')
     end
-
   end
 end

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

@@ -3,7 +3,6 @@ Shindo.tests('Fog::Storage[:rackspace] | account requests', ["rackspace"]) do
   tests('success') do
 
     tests("#post_set_meta_temp_url_key('super_secret_key')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].post_set_meta_temp_url_key('super_secret_key')
     end
 

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

@@ -1,6 +1,12 @@
 Shindo.tests('Fog::Storage[:rackspace] | container requests', ["rackspace"]) do
 
-  @container_format = [String]
+  @container_format = [{
+    'hash' => String,
+    'last_modified' => String,
+    'bytes' => Integer,
+    'name' => String,
+    'content_type' => String
+  }]
 
   @containers_format = [{
     'bytes' => Integer,
@@ -11,39 +17,32 @@ Shindo.tests('Fog::Storage[:rackspace] | container requests', ["rackspace"]) do
   tests('success') do
 
     tests("#put_container('fogcontainertests', {})").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].put_container('fogcontainertests')
     end
 
     tests("#put_container('fogcontainertests', 'X-Container-Meta-Color'=>'green')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].put_container('fogcontainertests', 'X-Container-Meta-Color'=>'green')
       response = Fog::Storage[:rackspace].head_container('fogcontainertests')
       returns('green') { response.headers['X-Container-Meta-Color'] }
     end
 
     tests("#get_container('fogcontainertests')").formats(@container_format) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_container('fogcontainertests').body
     end
 
     tests("#get_containers").formats(@containers_format) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_containers.body
     end
 
     tests("#head_container('fogcontainertests')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_container('fogcontainertests')
     end
 
     tests("#head_containers").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_containers
     end
 
     tests("#delete_container('fogcontainertests')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].delete_container('fogcontainertests')
     end
 
@@ -52,17 +51,14 @@ Shindo.tests('Fog::Storage[:rackspace] | container requests', ["rackspace"]) do
   tests('failure') do
 
     tests("#get_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_container('fognoncontainer')
     end
 
     tests("#head_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_container('fognoncontainer')
     end
 
     tests("#delete_container('fognoncontainer')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].delete_container('fognoncontainer')
     end