diff --git a/lower-constraints.txt b/lower-constraints.txt index 786311e2..2ae380da 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index 15de4891..f8dd9aae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/sahara_dashboard/content/data_processing/clusters/cluster_templates/tests.py b/sahara_dashboard/content/data_processing/clusters/cluster_templates/tests.py index 9110e0a6..eb867935 100644 --- a/sahara_dashboard/content/data_processing/clusters/cluster_templates/tests.py +++ b/sahara_dashboard/content/data_processing/clusters/cluster_templates/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/clusters/clusters/tests.py b/sahara_dashboard/content/data_processing/clusters/clusters/tests.py index 5016e8de..3fffc8fc 100644 --- a/sahara_dashboard/content/data_processing/clusters/clusters/tests.py +++ b/sahara_dashboard/content/data_processing/clusters/clusters/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/clusters/image_registry/tests.py b/sahara_dashboard/content/data_processing/clusters/image_registry/tests.py index b39d4189..f47bcc5d 100644 --- a/sahara_dashboard/content/data_processing/clusters/image_registry/tests.py +++ b/sahara_dashboard/content/data_processing/clusters/image_registry/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/tests.py b/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/tests.py index 26649131..a78a0b4c 100644 --- a/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/tests.py +++ b/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/tests.py @@ -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 diff --git a/sahara_dashboard/content/data_processing/clusters/wizard/tests.py b/sahara_dashboard/content/data_processing/clusters/wizard/tests.py index 6fcd1b2f..ac179fe3 100644 --- a/sahara_dashboard/content/data_processing/clusters/wizard/tests.py +++ b/sahara_dashboard/content/data_processing/clusters/wizard/tests.py @@ -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) diff --git a/sahara_dashboard/content/data_processing/data_plugins/tests.py b/sahara_dashboard/content/data_processing/data_plugins/tests.py index 2776ec4f..31013bab 100644 --- a/sahara_dashboard/content/data_processing/data_plugins/tests.py +++ b/sahara_dashboard/content/data_processing/data_plugins/tests.py @@ -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() diff --git a/sahara_dashboard/content/data_processing/jobs/data_sources/tests.py b/sahara_dashboard/content/data_processing/jobs/data_sources/tests.py index b21f2b8c..198339d4 100644 --- a/sahara_dashboard/content/data_processing/jobs/data_sources/tests.py +++ b/sahara_dashboard/content/data_processing/jobs/data_sources/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/jobs/job_binaries/tests.py b/sahara_dashboard/content/data_processing/jobs/job_binaries/tests.py index cb1a06c2..a9d26ac5 100644 --- a/sahara_dashboard/content/data_processing/jobs/job_binaries/tests.py +++ b/sahara_dashboard/content/data_processing/jobs/job_binaries/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/jobs/job_templates/tests.py b/sahara_dashboard/content/data_processing/jobs/job_templates/tests.py index b2b4a372..7fb73725 100644 --- a/sahara_dashboard/content/data_processing/jobs/job_templates/tests.py +++ b/sahara_dashboard/content/data_processing/jobs/job_templates/tests.py @@ -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', diff --git a/sahara_dashboard/content/data_processing/jobs/jobs/tests.py b/sahara_dashboard/content/data_processing/jobs/jobs/tests.py index d5ef993d..fad87ccb 100644 --- a/sahara_dashboard/content/data_processing/jobs/jobs/tests.py +++ b/sahara_dashboard/content/data_processing/jobs/jobs/tests.py @@ -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', diff --git a/sahara_dashboard/test/helpers.py b/sahara_dashboard/test/helpers.py index 3772574c..30b155ad 100644 --- a/sahara_dashboard/test/helpers.py +++ b/sahara_dashboard/test/helpers.py @@ -39,7 +39,6 @@ class SaharaTestsMixin(object): class TestCase(SaharaTestsMixin, helpers.TestCase): - use_mox = True pass diff --git a/test-requirements.txt b/test-requirements.txt index bd1bbc52..d4f08b67 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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