diff options
Diffstat (limited to 'tuskar_ui/infrastructure/resource_management/racks/tests.py')
-rw-r--r-- | tuskar_ui/infrastructure/resource_management/racks/tests.py | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/racks/tests.py b/tuskar_ui/infrastructure/resource_management/racks/tests.py index cca162fd..24932ee5 100644 --- a/tuskar_ui/infrastructure/resource_management/racks/tests.py +++ b/tuskar_ui/infrastructure/resource_management/racks/tests.py @@ -372,41 +372,39 @@ class RackViewTests(test.BaseAdminViewTests): self.assertEquals(res.content, state_json) @test.create_stubs({ - tuskar.Rack: ('get', 'list_baremetal_nodes', 'list_flavors', 'update', - 'tuskar_node_ids', 'list_tuskar_nodes'), - tuskar.TuskarNode: ('get',), + tuskar.Rack: ('get', 'list_baremetal_nodes', 'update', + 'list_tuskar_nodes'), tuskar.BaremetalNode: ('get',), + tuskar.TuskarNode: ('list',), }) def test_node_delete(self): rack = self.tuskar_racks.first() rack.request = self.request baremetal_nodes = self.baremetal_nodes.list() baremetal_node = baremetal_nodes[0] + baremetal_node.request = self.request tuskar_nodes = self.tuskar_nodes.list() - tuskar_node = tuskar_nodes[0] - - tuskar.Rack.list_baremetal_nodes = baremetal_nodes - tuskar.Rack.list_tuskar_nodes = tuskar_nodes - tuskar.Rack.tuskar_node_ids = [t_node.id for t_node in tuskar_nodes] - tuskar.Rack.list_flavors = [] tuskar.Rack.get(mox.IsA(http.HttpRequest), rack.id).AndReturn(rack) - tuskar.TuskarNode.get(mox.IsA(http.HttpRequest), - tuskar_node.id).AndReturn(tuskar_node) - tuskar.BaremetalNode.get(None, + tuskar.BaremetalNode.get(mox.IsA(http.HttpRequest), baremetal_node.id).AndReturn(baremetal_node) + tuskar.TuskarNode.list( + mox.IsA(http.HttpRequest)).AndReturn(tuskar_nodes) tuskar.Rack.get(None, rack.id).AndReturn(rack) # called by node.rack tuskar.Rack.update(mox.IsA(http.HttpRequest), rack.id, { - 'baremetal_nodes': [{'id': bm_node.id} - for bm_node in baremetal_nodes - if bm_node.id != baremetal_node.id], + 'baremetal_nodes': [{'id': node.id} + for node in baremetal_nodes + if node.id != baremetal_node.id], }).AndReturn(rack) + + tuskar.Rack.list_baremetal_nodes = baremetal_nodes + tuskar.Rack.list_tuskar_nodes = tuskar_nodes self.mox.ReplayAll() url = urlresolvers.reverse( 'horizon:infrastructure:resource_management:racks:detail', args=[rack.id]) - form_data = {'action': 'nodes_table__delete__%s' % tuskar_node.id} + form_data = {'action': 'nodes_table__delete__%s' % baremetal_node.id} response = self.client.post(url, form_data) self.assertNoFormErrors(response) self.assertMessageCount(success=1) |