Py34 fixes
This commit is contained in:
parent
359e6b8b5f
commit
935f575672
|
@ -84,7 +84,7 @@ def main(argv=None, stdout=None):
|
||||||
stdout.write(content)
|
stdout.write(content)
|
||||||
stdout.write(b"\n")
|
stdout.write(b"\n")
|
||||||
if args.output:
|
if args.output:
|
||||||
with open(args.output, 'w') as output:
|
with open(args.output, 'wb') as output:
|
||||||
output.write(content)
|
output.write(content)
|
||||||
output.write(b"\n")
|
output.write(b"\n")
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ class TestCollect(base.TestCase):
|
||||||
collect.main(
|
collect.main(
|
||||||
['os-collect-counters', '--subunit', '--output', tfile.name],
|
['os-collect-counters', '--subunit', '--output', tfile.name],
|
||||||
self.stdout)
|
self.stdout)
|
||||||
content = json.loads(tfile.read())
|
content = json.loads(tfile.read().decode('utf-8'))
|
||||||
self.assertTrue(isinstance(content, dict))
|
self.assertTrue(isinstance(content, dict))
|
||||||
self.assertIn('mysql', content)
|
self.assertIn('mysql', content)
|
||||||
self.assertIn('queues', content)
|
self.assertIn('queues', content)
|
||||||
|
|
Loading…
Reference in New Issue