openstack/glance
Code Issues Proposed changes

Changed psutil dep. to match global requirements

Browse Source 
Global requirements now expect that psutil<2.0.0
Therefore the call to children() in psutil was
invalid and was failing tests, so this commit
changes the call to get_children() and updates
test-requirements to reflect this version change

Change-Id: I9570dd1ec0cb9fd7efaee292d7996510b56ab611
This commit is contained in:
Ben Roble 2014-06-18 11:01:24 -04:00
parent c6dd4917f2
commit 832136d8c5
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