From 2381ed38be35fb3b9f09d99b62157ed5959285f6 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 4 Mar 2013 16:47:40 +0100
Subject: [PATCH 1/2] [openstack|identity] user model tests fixes

- update_tenant expects a tenant model or a tenant_id
- update_enabled expects a boolean
---
 tests/openstack/models/identity/user_tests.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/openstack/models/identity/user_tests.rb b/tests/openstack/models/identity/user_tests.rb
index 9ace034a6..63e50179e 100644
--- a/tests/openstack/models/identity/user_tests.rb
+++ b/tests/openstack/models/identity/user_tests.rb
@@ -26,11 +26,11 @@ Shindo.tests("Fog::Identity[:openstack] | user", ['openstack']) do
     end
 
     tests('#update_tenant').returns(true) do
-      @instance.update_tenant('swordfish')
+      @instance.update_tenant(tenant_id)
     end
 
     tests('#update_enabled').returns(true) do
-      @instance.update_enabled('swordfish')
+      @instance.update_enabled(true)
     end
 
     tests('#destroy').returns(true) do

From 3cbb6f26225d9ed5f44c22aeee5175f73619ccbe Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 4 Mar 2013 16:56:36 +0100
Subject: [PATCH 2/2] [openstack|identity] cleanup the test role when no longer
 in use

---
 tests/openstack/models/identity/roles_tests.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/openstack/models/identity/roles_tests.rb b/tests/openstack/models/identity/roles_tests.rb
index 1b42177a3..6e0dc1f85 100644
--- a/tests/openstack/models/identity/roles_tests.rb
+++ b/tests/openstack/models/identity/roles_tests.rb
@@ -14,6 +14,7 @@ Shindo.tests("Fog::Identity[:openstack] | roles", ['openstack']) do
     end
   end
 
+  @role.destroy
   @user.destroy
   @tenant.destroy
 end