fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

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
 

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

@@ -1,52 +1,47 @@
 Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace']) do
 
-  unless Fog.mocking?
-    @directory  = Fog::Storage[:rackspace].directories.create(:key => 'foglargeobjecttests')
-    @directory2 = Fog::Storage[:rackspace].directories.create(:key => 'foglargeobjecttests2')
-    @segments = {
-      :a => {
-        :container => @directory.identity,
-        :name      => 'fog_large_object/a',
-        :data      => 'a' * (1024**2 + 10),
-        :size      => 1024**2 + 10,
-        :etag      => 'c2e97007d59f0c19b850debdcb80cca5'
-      },
-      :b => {
-        :container => @directory.identity,
-        :name      => 'fog_large_object/b',
-        :data      => 'b' * (1024**2 + 20),
-        :size      => 1024**2 + 20,
-        :etag      => 'd35f50622a1259daad75ff7d5512c7ef'
-      },
-      :c => {
-        :container => @directory.identity,
-        :name      => 'fog_large_object2/a',
-        :data      => 'c' * (1024**2 + 30),
-        :size      => 1024**2 + 30,
-        :etag      => '901d3531a87d188041d4d5b43cb464c1'
-      },
-      :d => {
-        :container => @directory2.identity,
-        :name      => 'fog_large_object2/b',
-        :data      => 'd' * (1024**2 + 40),
-        :size      => 1024**2 + 40,
-        :etag      => '350c0e00525198813920a157df185c8d'
-      }
+  @directory  = Fog::Storage[:rackspace].directories.create(:key => 'foglargeobjecttests')
+  @directory2 = Fog::Storage[:rackspace].directories.create(:key => 'foglargeobjecttests2')
+  @segments = {
+    :a => {
+      :container => @directory.identity,
+      :name      => 'fog_large_object/a',
+      :data      => 'a' * (1024**2 + 10),
+      :size      => 1024**2 + 10,
+      :etag      => 'c2e97007d59f0c19b850debdcb80cca5'
+    },
+    :b => {
+      :container => @directory.identity,
+      :name      => 'fog_large_object/b',
+      :data      => 'b' * (1024**2 + 20),
+      :size      => 1024**2 + 20,
+      :etag      => 'd35f50622a1259daad75ff7d5512c7ef'
+    },
+    :c => {
+      :container => @directory.identity,
+      :name      => 'fog_large_object2/a',
+      :data      => 'c' * (1024**2 + 30),
+      :size      => 1024**2 + 30,
+      :etag      => '901d3531a87d188041d4d5b43cb464c1'
+    },
+    :d => {
+      :container => @directory2.identity,
+      :name      => 'fog_large_object2/b',
+      :data      => 'd' * (1024**2 + 40),
+      :size      => 1024**2 + 40,
+      :etag      => '350c0e00525198813920a157df185c8d'
     }
-  end
+  }
 
   tests('success') do
 
     tests('upload test segments').succeeds do
-      pending if Fog.mocking?
-
       @segments.each_value do |segment|
         Fog::Storage[:rackspace].put_object(segment[:container], segment[:name], segment[:data])
       end
     end
 
     tests('dynamic large object requests') do
-      pending if Fog.mocking?
 
       tests('#put_object_manifest alias').succeeds do
         Fog::Storage[:rackspace].put_object_manifest(@directory.identity, 'fog_large_object')
@@ -110,7 +105,6 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
     end
 
     tests('static large object requests') do
-      pending if Fog.mocking?
 
       tests('single container') do
 
@@ -209,7 +203,6 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
   tests('failure') do
 
     tests('dynamic large object requests') do
-      pending if Fog.mocking?
 
       tests('#put_dynamic_obj_manifest with missing container').raises(Fog::Storage::Rackspace::NotFound) do
         Fog::Storage[:rackspace].put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object')
@@ -218,7 +211,6 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
     end
 
     tests('static large object requests') do
-      pending if Fog.mocking?
 
       tests('upload test segments').succeeds do
         Fog::Storage[:rackspace].put_object(@segments[:a][:container], @segments[:a][:name], @segments[:a][:data])
@@ -358,8 +350,6 @@ Shindo.tests('Fog::Storage[:rackspace] | large object requests', ['rackspace'])
 
   end
 
-  unless Fog.mocking?
-    @directory.destroy
-    @directory2.destroy
-  end
+  @directory.destroy
+  @directory2.destroy
 end

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

@@ -1,8 +1,6 @@
 Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
-  unless Fog.mocking?
-    @directory = Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests')
-  end
+  @directory = Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests')
 
   module RackspaceStorageHelpers
     def override_path(path)
@@ -13,17 +11,14 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
   tests('success') do
 
     tests("#put_object('fogobjecttests', 'fog_object')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
     end
 
     tests("#get_object('fogobjectests', 'fog_object')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object').body == lorem_file.read
     end
 
     tests("#get_object('fogobjecttests', 'fog_object', &block)").succeeds do
-      pending if Fog.mocking?
       data = ''
       Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
         data << chunk
@@ -32,18 +27,15 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
     end
 
     tests("#head_object('fogobjectests', 'fog_object')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_object('fogobjecttests', 'fog_object')
     end
 
     tests("#delete_object('fogobjecttests', 'fog_object')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_object')
     end
 
     # an object key with no special characters
     tests("#get_object_http_url('fogobjecttests', 'fog_object','expiration timestamp')").succeeds do
-      pending if Fog.mocking?
       expires_at = 1344149532 # 2012-08-05 16:52:12 +1000
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
@@ -54,7 +46,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
     # an object key with no special characters
     tests("#get_object_https_url('fogobjecttests', 'fog_object','expiration timestamp')").succeeds do
-      pending if Fog.mocking?
       expires_at = 1344149532 # 2012-08-05 16:52:12 +1000
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
@@ -65,7 +56,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
     # an object key nested under a /
     tests("#get_object_https_url('fogobjecttests', 'fog/object','expiration timestamp')").succeeds do
-      pending if Fog.mocking?
       expires_at = 1344149532 # 2012-08-05 16:52:12 +1000
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
@@ -76,7 +66,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
     # an object key containing a -
     tests("#get_object_https_url('fogobjecttests', 'fog-object','expiration timestamp')").succeeds do
-      pending if Fog.mocking?
       expires_at = 1344149532 # 2012-08-05 16:52:12 +1000
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
@@ -86,8 +75,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
     end
 
     tests("put_object with block") do
-      pending if Fog.mocking?
-
       tests("#put_object('fogobjecttests', 'fog_object', &block)").succeeds do
         begin
           file = lorem_file
@@ -110,8 +97,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
     end
 
     tests('#delete_multiple_objects') do
-      pending if Fog.mocking?
-
       Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
       Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object2', lorem_file)
       Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests2')
@@ -139,38 +124,30 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
   tests('failure') do
 
     tests("#get_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_non_object')
     end
 
     tests("#get_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].get_object('fognoncontainer', 'fog_non_object')
     end
 
     tests("#head_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_object('fogobjecttests', 'fog_non_object')
     end
 
     tests("#head_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].head_object('fognoncontainer', 'fog_non_object')
     end
 
     tests("#delete_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_non_object')
     end
 
     tests("#delete_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::Rackspace::NotFound) do
-      pending if Fog.mocking?
       Fog::Storage[:rackspace].delete_object('fognoncontainer', 'fog_non_object')
     end
 
     tests('#delete_multiple_objects') do
-      pending if Fog.mocking?
-
       expected = {
         "Number Not Found"  => 2,
         "Response Status"   => "200 OK",
@@ -206,8 +183,6 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
   end
 
-  unless Fog.mocking?
-    @directory.destroy
-  end
+  @directory.destroy
 
 end