diff --git a/novadocker/tests/virt/docker/test_driver.py b/novadocker/tests/virt/docker/test_driver.py index 8469161..be13314 100644 --- a/novadocker/tests/virt/docker/test_driver.py +++ b/novadocker/tests/virt/docker/test_driver.py @@ -434,7 +434,7 @@ class DockerDriverTestCase(test_virt_drivers._VirtDriverTestCase, def test_get_memory_limit_from_sys_meta_in_object(self): instance = utils.get_test_instance(obj=True) limit = self.connection._get_memory_limit_bytes(instance) - self.assertEqual(2048 * units.Mi, limit) + self.assertEqual(512 * units.Mi, limit) def test_get_memory_limit_from_sys_meta_in_db_instance(self): instance = utils.get_test_instance(obj=False) diff --git a/requirements.txt b/requirements.txt index dc22dfe..05c206e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ Babel>=1.3 # BSD six>=1.9.0 # MIT oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0 -oslo.config>=3.7.0 # Apache-2.0 +oslo.config>=3.9.0 # Apache-2.0 oslo.concurrency>=3.5.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 docker-py>=1.6.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 25f7b2a..bcd9706 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking<0.11,>=0.10.0 coverage>=3.6 # Apache-2.0 discover # BSD -fixtures>=1.3.1 # Apache-2.0/BSD +fixtures<2.0,>=1.3.1 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0