x/deb-os-testr
Code Issues Proposed changes

Misc Python 3 compatibility fixes

Browse Source 
Python 3 renames StringIO -> io.  Use six to deal
with this change.

Introduces new test dependency on six for StringIO.

Change-Id: Ia875b7fcbb976599053970ef79ed3f3474626bad
This commit is contained in:
James Page 2015-06-23 09:47:44 +01:00
parent de604832c3
commit 4292155e3e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os_testr/tests/test_return_codes.py
View File

@ -14,13 +14,13 @@
import os import os
import shutil import shutil
import StringIO
import subprocess import subprocess
import tempfile import tempfile
import testtools import testtools
from os_testr.tests import base from os_testr.tests import base
from six import StringIO
DEVNULL = open(os.devnull, 'wb') DEVNULL = open(os.devnull, 'wb')
@ -47,8 +47,8 @@ class TestReturnCodes(base.TestCase):
shutil.copy('os_testr/tests/files/setup.cfg', self.setup_cfg_file) shutil.copy('os_testr/tests/files/setup.cfg', self.setup_cfg_file)
shutil.copy('os_testr/tests/files/__init__.py', self.init_file) shutil.copy('os_testr/tests/files/__init__.py', self.init_file)
self.stdout = StringIO.StringIO() self.stdout = StringIO()
self.stderr = StringIO.StringIO() self.stderr = StringIO()
# Change directory, run wrapper and check result # Change directory, run wrapper and check result
self.addCleanup(os.chdir, os.path.abspath(os.curdir)) self.addCleanup(os.chdir, os.path.abspath(os.curdir))
os.chdir(self.directory) os.chdir(self.directory)

1
test-requirements.txt
View File

@ -11,3 +11,4 @@ oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0 oslotest>=1.2.0 # Apache-2.0
testscenarios>=0.4 testscenarios>=0.4
ddt>=0.4.0 ddt>=0.4.0
six>=1.9.0