fog 1.10.0 → 1.10.1

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -9,6 +9,57 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     :metadata => { 'fog_test' => 'true' }
   }
 
+  tests('ready?') do
+    @server = Fog::Compute::RackspaceV2::Server.new
+
+    tests('default in ready state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Server::ACTIVE
+      @server.ready?
+    end
+
+    tests('custom ready state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE
+      @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE)
+    end
+
+    tests('default NOT in ready state').returns(false) do
+      @server.state = Fog::Compute::RackspaceV2::Server::REBOOT
+      @server.ready?
+    end
+
+    tests('custom NOT ready state').returns(false) do
+      @server.state = Fog::Compute::RackspaceV2::Server::REBOOT
+      @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE)
+    end
+
+    tests('default error state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Server::ERROR
+      exception_occurred = false
+      begin
+        @server.ready?
+      rescue Fog::Compute::RackspaceV2::InvalidServerStateException => e
+        exception_occurred = true
+        returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Server::ACTIVE }
+        returns(true) {e.current_state == Fog::Compute::RackspaceV2::Server::ERROR }
+      end
+      exception_occurred
+    end
+
+    tests('custom error state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Server::ACTIVE
+      exception_occurred = false
+      begin
+        @server.ready?(Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE, Fog::Compute::RackspaceV2::Server::ACTIVE)
+      rescue Fog::Compute::RackspaceV2::InvalidServerStateException => e
+        exception_occurred = true
+        returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Server::VERIFY_RESIZE }
+        returns(true) {e.current_state == Fog::Compute::RackspaceV2::Server::ACTIVE }
+      end
+      exception_occurred
+    end
+
+  end
+
   model_tests(service.servers, options, true) do
     @instance.wait_for(timeout=1500) { ready? }
     

data/tests/rackspace/models/identity/service_catalog_tests.rb

@@ -0,0 +1,81 @@
+require 'fog/rackspace/models/identity/service_catalog'
+
+Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
+
+  tests('#from_response') do
+    before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
+    "serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
+    {"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"},
+    {"type"=>"rax:load-balancer", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"},
+    {"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudLoadBalancers"},
+    {"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
+    "tenantId"=>"Mosso777",
+    "publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
+    {"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
+    "tenantId"=>"Mosso777",
+    "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}, {"type"=>"rax:database",
+    "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777"}, {"region"=>"ORD", "tenantId"=>"777",
+    "publicURL"=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDatabases"}, {"type"=>"rax:dns", "endpoints"=>[{"tenantId"=>"777",
+    "publicURL"=>"https://dns.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDNS"}, {"type"=>"compute", "endpoints"=>[{"versionId"=>"1.0", "tenantId"=>"777",
+    "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v1.0",
+    "publicURL"=>"https://servers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudServers"}, {"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
+    "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
+    "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
+    "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
+    "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
+    "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
+    "tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
+    {"region"=>"ORD", "tenantId"=>"Mosso777",
+    "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
+    Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
+
+    after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
+    @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
+    returns(after_hash) { @service_catalog.catalog }
+  end
+  
+  tests('services') do
+    services = ["cloudBlockStorage", "cloudDNS", "cloudDatabases", "cloudFiles", "cloudFilesCDN", "cloudLoadBalancers", "cloudMonitoring", "cloudServers", "cloudServersOpenStack"]
+    returns(services) { @service_catalog.services.collect {|s| s.to_s }.sort }
+  end
+  
+  tests('get_endpoints') do
+    endpoints = {:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}
+    returns(endpoints) { @service_catalog.get_endpoints(:cloudServersOpenStack) }
+    returns(endpoints) { @service_catalog.get_endpoints('cloudServersOpenStack') }
+    returns(nil) { @service_catalog.get_endpoints('non-existent') }
+  end
+  
+  tests('get_endpoint') do
+    tests('service with mulitple endpoints') do
+      returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :dfw) }
+      returns("https://ord.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord) }      
+      returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, 'dfw') }
+      returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint('cloudServersOpenStack', 'dfw') }
+    end
+    
+    tests('with one endpoint') do
+      returns("https://monitoring.api.rackspacecloud.com/v1.0/777") { @service_catalog.get_endpoint(:cloudMonitoring, 'dfw') }
+    end
+    
+    tests('error conditions') do
+      raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack) }
+      raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack, :sat) }
+      raises(RuntimeError) { @service_catalog.get_endpoint('non-existent') }
+    end    
+  end
+  
+  tests('reload').succeeds do
+    pending if Fog.mocking?
+
+    service = Fog::Identity[:rackspace]
+    service_catalog = service.service_catalog
+    service_catalog.catalog[:fakeService] = "http:///fake-endpoint.com"
+    returns("http:///fake-endpoint.com") { service_catalog.get_endpoint :fakeService }
+    returns("http:///fake-endpoint.com") { service.service_catalog.get_endpoint :fakeService }
+    service_catalog.reload
+    raises(RuntimeError) { service_catalog.get_endpoint :fakeService }
+    raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }    
+    
+  end  
+end

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

@@ -2,8 +2,12 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
 
   pending if Fog.mocking?
 
+  def object_attributes(file=@instance)
+    @instance.service.head_object(@directory.key, file.key).headers
+  end
+
   def object_meta_attributes(file=@instance)
-    @instance.service.head_object(@directory.key, file.key).headers.reject {|k, v| !(k =~ /X-Object-Meta-/)}
+    object_attributes(file).reject {|k, v| !(k =~ /X-Object-Meta-/)}
   end
 
   def clear_metadata
@@ -85,6 +89,11 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
           @file = @directory.files.create :key => 'meta-test', :body => lorem_file, :metadata => {:works => true }
           object_meta_attributes(@file)["X-Object-Meta-Works"]
         end
+
+        tests("sets Content-Disposition on create").returns("ho-ho-ho") do
+          @file = @directory.files.create :key => 'meta-test', :body => lorem_file, :content_disposition => 'ho-ho-ho'
+          object_attributes(@file)["Content-Disposition"]
+        end
       ensure
         @file.destroy if @file
       end

data/tests/rackspace/rackspace_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Rackspace', ['rackspace']) do
+
+  tests('normalize_url') do
+    tests('should return nil if endpoint is nil').returns(nil) do
+      Fog::Rackspace.normalize_url nil
+    end
+    tests('should remove trailing spaces').returns("https://dfw.blockstorage.api.rackspacecloud.com/v1") do
+      Fog::Rackspace.normalize_url "https://dfw.blockstorage.api.rackspacecloud.com/v1 "
+    end
+    tests('should remove trailing /').returns("https://dfw.blockstorage.api.rackspacecloud.com/v1") do
+      Fog::Rackspace.normalize_url "https://dfw.blockstorage.api.rackspacecloud.com/v1/"
+    end
+    tests('should downcase url').returns("https://dfw.blockstorage.api.rackspacecloud.com/v1") do
+      Fog::Rackspace.normalize_url "HTTPS://DFW.BLOCKSTORAGE.API.RACKSPACECLOUD.COM/V1"
+    end
+    tests('show do all three').returns("https://dfw.blockstorage.api.rackspacecloud.com/v1") do
+      Fog::Rackspace.normalize_url "HTTPS://DFW.BLOCKSTORAGE.API.RACKSPACECLOUD.COM/V1/ "
+    end
+  end
+
+end

data/tests/rackspace/requests/compute_v2/metadata_tests.rb

@@ -16,8 +16,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do
         
         
         @server_id = @server.id
-        @image_id = @server.create_image(name, :metadata => metadata)
-        @image = @service.images.get @image_id
+        @image  = @server.create_image(name, :metadata => metadata)
+        @image_id = @image.id
       else
         @image_id = 1
         @server_id = 1

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

@@ -6,7 +6,7 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
   module RackspaceStorageHelpers
     def override_path(path)
-      @path = path
+      @uri.path = path
     end
   end
 
@@ -70,7 +70,7 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
-      object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)
+      object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)      
       object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog%2Dobject\?temp_url_sig=a24dd5fc955a57adce7d1b5bc4ec2c7660ab8396&temp_url_expires=1344149532/
     end
 

data/tests/rackspace/storage_tests.rb

@@ -1,8 +1,104 @@
-Shindo.tests('Fog::Storage::Rackspace', ['rackspace']) do |variable|
+Shindo.tests('Rackspace | Storage', ['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 }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::Storage::Rackspace.new
+  
+    assert_method nil, :authenticate_v2
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1    
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+    
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1    
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+  
+  tests('authentication v1') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").nil? }
+      returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.head_containers
+    end
+    tests('custom endpoint') do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', 
+        :rackspace_storage_url => 'https://my-custom-endpoint.com'
+        returns(false, "auth token populated") { @service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('authentation v2') do
+    pending if Fog.mocking?
+    
+    tests('variables populated').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").nil? }
+      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.head_containers
+    end
+    tests('dfw region').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil }
+      @service.head_containers
+    end
+    tests('ord region').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord\d/) != nil }
+      @service.head_containers
+    end
+    tests('custom endpoint').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', 
+        :rackspace_storage_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
   
+  tests('default auth') do
+    pending if Fog.mocking?
+    
+    tests('no params').succeeds do
+      @service = Fog::Storage::Rackspace.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil }
+      @service.head_containers
+    end
+    tests('specify region').succeeds do
+      @service = Fog::Storage::Rackspace.new :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord\d/ ) != nil }
+      @service.head_containers
+    end    
+    tests('custom endpoint') do
+      @service = Fog::Storage::Rackspace.new :rackspace_storage_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+    tests('rackspace_servicenet') do
+      @service = Fog::Storage::Rackspace.new :rackspace_servicenet => true
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil }
+    end
+  end
+    
   tests('account').succeeds do
+    pending if Fog.mocking?    
      Fog::Storage[:rackspace].account
   end
-end
+end
+

data/tests/riakcs/requests/provisioning/provisioning_tests.rb

@@ -0,0 +1,174 @@
+Shindo.tests('RiakCS::Provisioning | provisioning requests', ['riakcs']) do
+
+  current_timestamp = Time.now.to_i
+
+  user_format = {
+    'email'        => String,
+    'display_name' => String,
+    'name'         => String,
+    'key_id'       => String,
+    'key_secret'   => String,
+    'id'           => String,
+    'status'       => String,
+  }
+
+  tests('User creation') do
+
+    tests('is successful').returns(String) do
+
+      # Create a user.
+      #
+      email, name = "successful_user_creation_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+      key_id.class
+
+    end
+
+    tests('is successful anonymously').returns(String) do
+
+      # Create a user.
+      #
+      email, name = "successful_anonymous_user_creation_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name, :anonymous => true).body['key_id']
+      key_id.class
+
+    end
+
+    tests('fails if duplicate').raises(Fog::RiakCS::Provisioning::UserAlreadyExists) do
+      2.times do
+        email, name = "failed_duplicate_user_creation_test_#{current_timestamp}@example.com", "Fog User"
+        key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+      end
+    end
+
+    tests('fails if invalid email').raises(Fog::RiakCS::Provisioning::ServiceUnavailable) do
+      email, name = "failed_duplicate_user_creation_test_#{current_timestamp}", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+    end
+
+  end
+
+  tests('User disable') do
+
+    tests('is successful').returns(200) do
+
+      # Create a user.
+      #
+      email, name = "successful_user_disable_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      Fog::RiakCS[:provisioning].disable_user(key_id).status
+
+    end
+
+  end
+
+  tests('User enable') do
+
+    tests('is successful').returns(200) do
+
+      # Create a user.
+      #
+      email, name = "successful_user_disable_enable_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      Fog::RiakCS[:provisioning].disable_user(key_id).status
+      Fog::RiakCS[:provisioning].enable_user(key_id).status
+
+    end
+
+  end
+
+  tests('User granted new key secret') do
+
+    tests('is successful').returns(true) do
+
+      # Create a user.
+      #
+      email, name        = "successful_user_regrant_test_#{current_timestamp}@example.com", "Fog User"
+      user               = Fog::RiakCS[:provisioning].create_user(email, name).body
+      key_id, key_secret = user['key_id'], user['key_secret']
+
+      Fog::RiakCS[:provisioning].regrant_secret(key_id).status
+
+      # Verify new secret.
+      #
+      new_key_secret = Fog::RiakCS[:provisioning].get_user(key_id).body['key_secret']
+      new_key_secret != key_secret
+
+    end
+
+  end
+
+  tests('User retrieval') do
+
+    tests('is successful').formats(user_format) do
+
+      # Create a user.
+      #
+      email, name = "user_retrieval_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      # Get user details.
+      #
+      Fog::RiakCS[:provisioning].get_user(key_id).body
+
+    end
+
+  end
+
+  tests('User listing') do
+
+    tests('sucessfully lists users').formats(user_format) do
+
+      # Create a user.
+      #
+      email, name = "user_listing_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      # Ensure the list users response contains the user that we just
+      # created.
+      #
+      Fog::RiakCS[:provisioning].list_users.body.select { |x| x['email'] == email }.first
+
+    end
+
+    tests('successfully lists users containing no disabled users').returns(nil) do
+
+      # Create a user.
+      #
+      email, name = "user_listing_without_disabled_users_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      # Disable that user.
+      #
+      Fog::RiakCS[:provisioning].disable_user(key_id)
+
+      # Ensure the list users response does not contain the user that we
+      # just created and disabled.
+      #
+      Fog::RiakCS[:provisioning].list_users(:status => :enabled).body.select { |x| x['Email'] == email }.first
+
+    end
+
+    tests('successfully lists users containing disabled users').formats(user_format) do
+
+      # Create a user.
+      #
+      email, name = "user_listing_with_disabled_users_test_#{current_timestamp}@example.com", "Fog User"
+      key_id      = Fog::RiakCS[:provisioning].create_user(email, name).body['key_id']
+
+      # Disable that user.
+      #
+      Fog::RiakCS[:provisioning].disable_user(key_id)
+
+      # Ensure the list users response contains the user that we just
+      # created and disabled.
+      #
+      Fog::RiakCS[:provisioning].list_users.body.select { |x| x['email'] == email }.first
+
+    end
+
+  end
+
+end