From 832136d8c5254af17b3b4049ff6236e58f0bd091 Mon Sep 17 00:00:00 2001 From: Ben Roble Date: Wed, 18 Jun 2014 11:01:24 -0400 Subject: [PATCH] Changed psutil dep. to match global requirements 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 --- glance/tests/functional/v1/test_multiprocessing.py | 2 +- test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glance/tests/functional/v1/test_multiprocessing.py b/glance/tests/functional/v1/test_multiprocessing.py index e63b72047b..f6eeb15d71 100644 --- a/glance/tests/functional/v1/test_multiprocessing.py +++ b/glance/tests/functional/v1/test_multiprocessing.py @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index 986b85339f..9fa52e7f6f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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