openstack/glance
Code Issues Proposed changes

Merge "Changed psutil dep. to match global requirements"

Browse Source
This commit is contained in:
Jenkins 2014-06-19 16:53:44 +00:00 committed by Gerrit Code Review
commit 35b8068934
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/tests/functional/v1/test_multiprocessing.py
View File

@ -45,7 +45,7 @@ class TestMultiprocessing(functional.FunctionalTest):
api_pid = self.api_server.process_pid
process = psutil.Process(api_pid)
children = process.children()
children = process.get_children()
pids = [str(child.pid) for child in children]
return pids

2
test-requirements.txt
View File

@ -14,7 +14,7 @@ sphinx>=1.1.2,<1.2
requests>=1.1
testrepository>=0.0.18
testtools>=0.9.34
psutil>=1.1.1
psutil>=1.1.1,<2.0.0
# Optional packages that should be installed when testing
MySQL-python