Merge "Use six.moves cStringIO instead of cStringIO"

This commit is contained in:
Jenkins
2014-10-13 21:57:57 +00:00
committed by Gerrit Code Review

View File

@@ -71,8 +71,8 @@ class ShellTest(testtools.TestCase):
clean_env = {} clean_env = {}
_old_env, os.environ = os.environ, clean_env.copy() _old_env, os.environ = os.environ, clean_env.copy()
try: try:
sys.stdout = six.StringIO() sys.stdout = six.moves.cStringIO()
sys.stderr = six.StringIO() sys.stderr = six.moves.cStringIO()
_shell = openstack_shell.NeutronShell('2.0') _shell = openstack_shell.NeutronShell('2.0')
_shell.run(argstr.split()) _shell.run(argstr.split())
except SystemExit: except SystemExit: