openstack
/
sahara-dashboard
Code Issues Proposed changes

Drop mox usage in SaharaApiTest 

Apart of the mox3 community goal for Rocky.

Change-Id: I8f464e10f800eddfe0183fb3c2c152e37f001097
Signed-off-by: Charles Short <zulcss@gmail.com>
This commit is contained in:
Charles Short 2018-05-12 11:58:07 -04:00
parent 34481589ea
commit a262a42a94
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sahara_dashboard/test/api_tests/sahara_tests.py
View File

@ -22,25 +22,8 @@ class SaharaApiTest(test.SaharaAPITestCase):
# #
def test_cluster_create_count(self): def test_cluster_create_count(self):
saharaclient = self.stub_saharaclient() saharaclient = self.stub_saharaclient()
saharaclient.clusters = self.mox.CreateMockAnything() saharaclient.clusters.create.return_value = \
saharaclient.clusters.create(anti_affinity=None, {"Clusters": ['cluster1', 'cluster2']}
cluster_configs=None,
cluster_template_id=None,
count=2,
use_autoconfig=None,
default_image_id=None,
description=None,
hadoop_version='1.0.0',
is_transient=None,
name='name',
net_id=None,
node_groups=None,
plugin_name='fake_plugin',
user_keypair_id=None,
is_public=False,
is_protected=False) \
.AndReturn({"Clusters": ['cluster1', 'cluster2']})
self.mox.ReplayAll()
ret_val = api.sahara.cluster_create(self.request, ret_val = api.sahara.cluster_create(self.request,
'name', 'name',
'fake_plugin', 'fake_plugin',

7
sahara_dashboard/test/helpers.py
View File

@ -13,8 +13,6 @@
import mock import mock
from saharaclient import client as sahara_client
from openstack_dashboard.test import helpers from openstack_dashboard.test import helpers
from sahara_dashboard import api from sahara_dashboard import api
@ -51,8 +49,6 @@ class BaseAdminViewTests(SaharaTestsMixin, helpers.TestCase):
class SaharaAPITestCase(helpers.APITestCase): class SaharaAPITestCase(helpers.APITestCase):
use_mox = True
def setUp(self): def setUp(self):
super(SaharaAPITestCase, self).setUp() super(SaharaAPITestCase, self).setUp()
@ -66,6 +62,5 @@ class SaharaAPITestCase(helpers.APITestCase):
def stub_saharaclient(self): def stub_saharaclient(self):
if not hasattr(self, "saharaclient"): if not hasattr(self, "saharaclient"):
self.mox.StubOutWithMock(sahara_client, 'Client') self.saharaclient = mock.Mock()
self.saharaclient = self.mox.CreateMock(sahara_client.Client)
return self.saharaclient return self.saharaclient