summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-12-16 15:34:39 -0500
committerBrian Lamar <brian.lamar@rackspace.com>2011-12-16 15:34:39 -0500
commitd3444a4c9cfdd1fa172406d0d5eb7ead5fba5088 (patch)
tree651c02fe90685d156900f87fde7f5fca50c1df46
parent16e9471f20cd48b3f57535df01cbfe55d6a45e1f (diff)
Python 2.6 subprocess.check_output doesn't exist.
bug 905482 Change-Id: Id83ca0d6d9759dcab397361ddc11f71ebe0798e7
-rw-r--r--keystone/test/unit/test_keystone_manage.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/keystone/test/unit/test_keystone_manage.py b/keystone/test/unit/test_keystone_manage.py
index 9b501b1f..efa2c589 100644
--- a/keystone/test/unit/test_keystone_manage.py
+++ b/keystone/test/unit/test_keystone_manage.py
@@ -19,8 +19,12 @@ class TestKeystoneManage(unittest.TestCase):
"""
Test that we can call keystone-manage
"""
- result = subprocess.check_output([os.path.join(possible_topdir, 'bin',
- 'keystone-manage'), '--help'])
+ cmd = [
+ os.path.join(possible_topdir, 'bin', 'keystone-manage'),
+ '--help',
+ ]
+ process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+ result = process.communicate()[0]
self.assertIn('Usage', result)
if __name__ == '__main__':