Fix tests failing under django 1.8

Change-Id: I440bd969fcd411f6d580d303a7ee6c8ad1610d90

2 files changed, 13 insertions, 3 deletions

diff --git a/tuskar_ui/infrastructure/nodes/tables.py b/tuskar_ui/infrastructure/nodes/tables.py
index a7751a16..f4d65272 100644
--- a/tuskar_ui/infrastructure/nodes/tables.py
+++ b/tuskar_ui/infrastructure/nodes/tables.py
@@ -136,7 +136,7 @@ def _get_role_link(role_id):
 
 
 def get_role_link(datum):
-    return _get_role_link(datum.role_id)
+    return _get_role_link(getattr(datum, 'role_id', None))
 
 
 def get_power_state_with_transition(node):
diff --git a/tuskar_ui/infrastructure/nodes/tests.py b/tuskar_ui/infrastructure/nodes/tests.py
index 3be52c23..66ec0c7e 100644
--- a/tuskar_ui/infrastructure/nodes/tests.py
+++ b/tuskar_ui/infrastructure/nodes/tests.py
@@ -292,12 +292,18 @@ class NodesTests(test.BaseAdminViewTests):
 
     def test_node_detail(self):
         node = api.node.Node(self.ironicclient_nodes.list()[0])
+
+        def get_node(request, uuid, **kwargs):
+            node._request = request
+            node.addresses = []
+            return node
+
         image = self.glanceclient_images.first()
 
         with contextlib.nested(
             mock.patch('tuskar_ui.api.node.Node', **{
                 'spec_set': ['get'],
-                'get.return_value': node,
+                'get.side_effect': get_node,
             }),
             mock.patch('tuskar_ui.api.heat.Resource', **{
                 'spec_set': ['get_by_node'],
@@ -308,7 +314,11 @@ class NodesTests(test.BaseAdminViewTests):
                 'openstack_dashboard.api.glance.image_get',
                 return_value=image,
             ),
-        ) as (mock_node, mock_heat, mock_glance):
+            mock.patch(
+                'openstack_dashboard.api.nova.server_list',
+                return_value=([], False),
+            ),
+        ) as (mock_node, mock_heat, mock_glance, mock_nova):
             res = self.client.get(
                 urlresolvers.reverse(DETAIL_VIEW, args=(node.uuid,))
             )