openstack/heat-dashboard
Code Issues Proposed changes

Merge "Require the (soon-to-be) Rocky version of Horizon"

Browse Source
This commit is contained in:
Zuul 2018-06-05 02:31:04 +00:00 committed by Gerrit Code Review
commit 95d3b7233a
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat_dashboard/test/helpers.py
View File

@ -372,6 +372,8 @@ class BaseAdminViewTests(TestCase):
For testing admin-only views and functionality. For testing admin-only views and functionality.
""" """
use_mox = True
def setActiveUser(self, *args, **kwargs): def setActiveUser(self, *args, **kwargs):
if "roles" not in kwargs: if "roles" not in kwargs:
kwargs['roles'] = [self.roles.admin._info] kwargs['roles'] = [self.roles.admin._info]
@ -395,6 +397,8 @@ class APITestCase(TestCase):
For use with tests which deal with the underlying clients rather than For use with tests which deal with the underlying clients rather than
stubbing out the openstack_dashboard.api.* methods. stubbing out the openstack_dashboard.api.* methods.
""" """
use_mox = True
def setUp(self): def setUp(self):
super(APITestCase, self).setUp() super(APITestCase, self).setUp()
utils.patch_middleware_get_user() utils.patch_middleware_get_user()
@ -449,6 +453,8 @@ class APITestCase(TestCase):
# Need this to test both Glance API V1 and V2 versions # Need this to test both Glance API V1 and V2 versions
class ResetImageAPIVersionMixin(object): class ResetImageAPIVersionMixin(object):
use_mox = True
def setUp(self): def setUp(self):
super(ResetImageAPIVersionMixin, self).setUp() super(ResetImageAPIVersionMixin, self).setUp()
project_api.glance.VERSIONS.clear_active_cache() project_api.glance.VERSIONS.clear_active_cache()

2
heat_dashboard/test/tests/api/heat_tests.py
View File

@ -21,6 +21,8 @@ from horizon import exceptions
class HeatApiTests(test.APITestCase): class HeatApiTests(test.APITestCase):
use_mox = True
def test_stack_list(self): def test_stack_list(self):
api_stacks = self.stacks.list() api_stacks = self.stacks.list()
limit = getattr(settings, 'API_RESULT_LIMIT', 1000) limit = getattr(settings, 'API_RESULT_LIMIT', 1000)

2
lower-constraints.txt
View File

@ -32,7 +32,7 @@ flake8-import-order==0.12
futurist==1.2.0 futurist==1.2.0
greenlet==0.4.10 greenlet==0.4.10
hacking==0.12.0 hacking==0.12.0
horizon==13.0.0 horizon==14.0.0.0b1
idna==2.6 idna==2.6
iso8601==0.1.11 iso8601==0.1.11
Jinja2==2.10 Jinja2==2.10

2
requirements.txt
View File

@ -12,4 +12,4 @@ python-heatclient>=1.10.0 # Apache-2.0
# This will be installed from git in OpenStack CI if the job setting # This will be installed from git in OpenStack CI if the job setting
# required-projects for horizon: # required-projects for horizon:
horizon>=13.0.0 # Apache-2.0 horizon>=14.0.0.0b1 # Apache-2.0