From b22495e03c6c3e8dcf525699fc924ca6a29853a0 Mon Sep 17 00:00:00 2001 From: Ken Pepple Date: Sun, 20 Jul 2014 08:13:59 -0700 Subject: [PATCH] fixes TypeError coercing of tempfile in subunit2json.py Closes-Bug: #1343312 Change-Id: I9d86169de7dd69311fcf1478f0708a66834d5857 --- rally/verification/verifiers/tempest/subunit2json.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rally/verification/verifiers/tempest/subunit2json.py b/rally/verification/verifiers/tempest/subunit2json.py index 719f814ec4..fa019ff838 100644 --- a/rally/verification/verifiers/tempest/subunit2json.py +++ b/rally/verification/verifiers/tempest/subunit2json.py @@ -137,7 +137,7 @@ class FileAccumulator(testtools.StreamResult): def main(subunit_log_file): - results_file, _ = tempfile.mkstemp() + fd, results_file = tempfile.mkstemp() result = JsonOutput(results_file) stream = open(subunit_log_file, 'rb') @@ -161,8 +161,8 @@ def main(subunit_log_file): suite = subunit.ProtocolTestCase(bytes_io) suite.run(result) result.stopTestRun() - with open(results_file, 'rb') as results_file: - data = results_file.read() + with open(results_file, 'rb') as temp_results_file: + data = temp_results_file.read() try: os.unlink(results_file) except OSError as e: