Goodbye mox - no more needed

The porting to mock of sahara-dashboard is complete.
This fulfills the community goal
"Remove Use of mox/mox3 for Testing" set for Rocky:
https://governance.openstack.org/tc/goals/rocky/mox_removal.html

Raise the requirement to the Rocky M2 release of Horizon,
which drops the usage of mox by default (it should be
explicitly enabled). Without a forced import from Horizon
the mox dependencies can be dropped here.
Bump also a dependency needed by this new version of Horizon.

Change-Id: Iaf272af9919f8a69562c0a469130bbf8628936cf
This commit is contained in:
Luigi Toscano 2018-07-04 19:38:21 +02:00
parent 5fc84cd7d2
commit 56b69d6477
14 changed files with 4 additions and 27 deletions

View File

@ -28,7 +28,7 @@ flake8==2.5.5
futurist==1.2.0
greenlet==0.4.10
hacking==0.12.0
horizon==14.0.0.0b1
horizon==14.0.0.0b2
idna==2.6
iso8601==0.1.11
Jinja2==2.10
@ -43,7 +43,6 @@ MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0
munch==2.1.0
netaddr==0.7.18
@ -87,7 +86,7 @@ python-cinderclient==3.3.0
python-dateutil==2.5.3
python-designateclient==2.7.0
python-glanceclient==2.8.0
python-keystoneclient==3.8.0
python-keystoneclient==3.15.0
python-manilaclient==1.16.0
python-mimeparse==1.6.0
python-neutronclient==6.7.0

View File

@ -10,11 +10,11 @@ django-compressor>=2.0 # MIT
oslo.log>=3.36.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
python-designateclient>=2.7.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
python-keystoneclient>=3.15.0 # Apache-2.0
python-manilaclient>=1.16.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0
python-novaclient>=9.1.0 # Apache-2.0
python-saharaclient>=1.4.0 # Apache-2.0
pytz>=2013.6 # MIT
horizon>=14.0.0.0b1 # Apache-2.0
horizon>=14.0.0.0b2 # Apache-2.0

View File

@ -30,8 +30,6 @@ DETAILS_URL = reverse(
class DataProcessingClusterTemplateTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('cluster_template_list',
'image_list',
'cluster_list',

View File

@ -27,8 +27,6 @@ DETAILS_URL = reverse(
class DataProcessingClusterTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('cluster_template_list',
'image_list',
'cluster_list',

View File

@ -28,8 +28,6 @@ SUCCESS_URL = reverse(
class DataProcessingImageRegistryTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('cluster_template_list',
'image_list',
'cluster_list',

View File

@ -35,8 +35,6 @@ CREATE_URL = reverse(
class DataProcessingNodeGroupTests(test.TestCase):
use_mox = False
@mock.patch('openstack_dashboard.api.base.is_service_enabled')
def _setup_copy_test(self, service_checker):
service_checker.return_value = True

View File

@ -25,8 +25,6 @@ CLUSTER_GUIDE_RESET_URL = reverse(
class DataProcessingClusterGuideTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('nodegroup_template_find',)})
def test_cluster_guide(self):
res = self.client.get(CLUSTER_GUIDE_URL)

View File

@ -27,8 +27,6 @@ DETAILS_URL = reverse(
class DataProcessingPluginsTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('plugin_list',)})
def test_index(self):
self.mock_plugin_list.return_value = self.plugins.list()

View File

@ -31,8 +31,6 @@ EDIT_URL = reverse(
class DataProcessingDataSourceTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('job_execution_list',
'plugin_list', 'job_binary_list',
'data_source_list',

View File

@ -29,8 +29,6 @@ CREATE_URL = reverse(
class DataProcessingJobBinaryTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('job_execution_list',
'plugin_list', 'job_binary_list',
'data_source_list',

View File

@ -24,8 +24,6 @@ DETAILS_URL = reverse(
class DataProcessingJobTemplateTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('job_execution_list',
'plugin_list', 'job_binary_list',
'data_source_list',

View File

@ -24,8 +24,6 @@ DETAILS_URL = reverse(
class DataProcessingJobTests(test.TestCase):
use_mox = False
@test.create_mocks({api.sahara: ('job_execution_list',
'plugin_list', 'job_binary_list',
'data_source_list',

View File

@ -39,7 +39,6 @@ class SaharaTestsMixin(object):
class TestCase(SaharaTestsMixin, helpers.TestCase):
use_mox = True
pass

View File

@ -7,7 +7,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
django-nose>=1.4.4 # BSD
mock>=2.0.0 # BSD
mox3>=0.20.0 # Apache-2.0
netifaces>=0.10.4 # MIT
nose-exclude>=0.5.0 # LGPL
python-subunit>=1.0.0 # Apache-2.0/BSD