x
/
nova-docker
Code Issues Proposed changes

Updated from global requirements 

Change-Id: I3b36c5b730727537517450485b661a1b07279839
This commit is contained in:
OpenStack Proposal Bot 2016-04-08 00:31:26 +00:00 committed by Davanum Srinivas
parent 7a44a97468
commit d5e91cda2f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novadocker/tests/virt/docker/test_driver.py
View File

@ -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)

2
requirements.txt
View File

@ -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

2
test-requirements.txt
View File

@ -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