From dd3f3c88109af9a7def5d8157362c8c2431e6235 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 23 Apr 2018 23:15:29 +0200 Subject: [PATCH] Require the (soon-to-be) Rocky version of Horizon ... or at least the first published tarball which will lead to Rocky. On the other side this means forcing the usage of mox as long as there are tests that depends on it (the switch was already flipped in Horizon, so it needs to be enabled here). This allows us to depend on newer Horizon features, including changes to the test suite that are useful for the mox removal effort. Change-Id: Ibf95b642f49aee9b3165f46e0422ff6bf56e9391 --- lower-constraints.txt | 2 +- requirements.txt | 2 +- sahara_dashboard/test/helpers.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index f0bf88a9..786311e2 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==13.0.0 +horizon==14.0.0.0b1 idna==2.6 iso8601==0.1.11 Jinja2==2.10 diff --git a/requirements.txt b/requirements.txt index aa2d0d0d..edca13d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,4 +16,4 @@ python-novaclient>=9.1.0 # Apache-2.0 python-saharaclient>=1.4.0 # Apache-2.0 pytz>=2013.6 # MIT -horizon>=13.0.0 # Apache-2.0 +horizon>=14.0.0.0b1 # Apache-2.0 diff --git a/sahara_dashboard/test/helpers.py b/sahara_dashboard/test/helpers.py index 2fca1ed6..24ca12fe 100644 --- a/sahara_dashboard/test/helpers.py +++ b/sahara_dashboard/test/helpers.py @@ -35,6 +35,7 @@ class SaharaTestsMixin(object): class TestCase(SaharaTestsMixin, helpers.TestCase): + use_mox = True pass @@ -44,6 +45,8 @@ class BaseAdminViewTests(SaharaTestsMixin, helpers.TestCase): class SaharaAPITestCase(helpers.APITestCase): + use_mox = True + def setUp(self): super(SaharaAPITestCase, self).setUp()