diff --git a/doc/source/contributor/testing/template_model_sync_test.rst b/doc/source/contributor/testing/template_model_sync_test.rst index 749cf67b8b0..befc315220c 100644 --- a/doc/source/contributor/testing/template_model_sync_test.rst +++ b/doc/source/contributor/testing/template_model_sync_test.rst @@ -150,7 +150,7 @@ test execution. :: - psutil>=1.1.1,<2.0.0 + psutil>=3.2.2 # BSD psycopg2 PyMySQL>=0.6.2 # MIT License diff --git a/neutron/tests/functional/test_server.py b/neutron/tests/functional/test_server.py index a31639d2b2c..43110f789d9 100644 --- a/neutron/tests/functional/test_server.py +++ b/neutron/tests/functional/test_server.py @@ -110,10 +110,7 @@ class TestNeutronServer(base.BaseTestCase): def safe_ppid(proc): try: - if psutil.version_info[0] == 1: - return proc.ppid - else: - return proc.ppid() + return proc.ppid() except psutil.NoSuchProcess: return None