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

heat_dashboard/test/helpers.py

@@ -372,6 +372,8 @@ class BaseAdminViewTests(TestCase):
 
     For testing admin-only views and functionality.
     """
+    use_mox = True
+
     def setActiveUser(self, *args, **kwargs):
         if "roles" not in kwargs:
             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
     stubbing out the openstack_dashboard.api.* methods.
     """
+    use_mox = True
+
     def setUp(self):
         super(APITestCase, self).setUp()
         utils.patch_middleware_get_user()
@@ -449,6 +453,8 @@ class APITestCase(TestCase):
 
 # Need this to test both Glance API V1 and V2 versions
 class ResetImageAPIVersionMixin(object):
+    use_mox = True
+
     def setUp(self):
         super(ResetImageAPIVersionMixin, self).setUp()
         project_api.glance.VERSIONS.clear_active_cache()

heat_dashboard/test/tests/api/heat_tests.py

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

lower-constraints.txt

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

requirements.txt

@@ -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
 # required-projects for horizon:
-horizon>=13.0.0 # Apache-2.0
+horizon>=14.0.0.0b1 # Apache-2.0