From e81ba6f2463dedb7dff753bc256f817be61ab184 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Wed, 23 Jul 2014 02:43:43 +0100
Subject: [PATCH] test_heatclient fix mocking with latest keystone

The tests break with latest (0.10.0) keystoneclient, so replace
the mocked domain with a MockAnything object

Change-Id: Icd460e554656e11ef8c4bcda62c1363b7eed8a68
Closes-Bug: #1347319
---
 heat/tests/test_heatclient.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py
index b09931c330..1d05aba0c3 100644
--- a/heat/tests/test_heatclient.py
+++ b/heat/tests/test_heatclient.py
@@ -1368,11 +1368,10 @@ class KeystoneClientTestDomainName(KeystoneClientTest):
         cfg.CONF.clear_override('stack_user_domain_name')
 
     def _stub_domain_admin_client_domain_get(self):
+        dummy_domain = self.m.CreateMockAnything()
+        dummy_domain.id = 'adomain123'
         self.mock_ks_v3_client_domain_mngr.get('adomain123').AndReturn(
-            kc_v3_domains.Domain(
-                self.mock_ks_v3_client_domain_mngr,
-                {'id': 'adomain123'},
-                loaded=True))
+            dummy_domain)
 
     def _stub_domain_admin_client(self, auth_ok=True):
         kc_v3.Client(