Merge lp:~gmb/maas-test/fix-bug-1266996 into lp:maas-test

[Graham Binns]

Fix bug 1266996 by making sure we're using CachingOutputStream correctly.

This branch fixes bug 126696 by making sure that we're using CachingOutputStream correctly.

[Jeroen T. Vermeulen (jtv)]

Ah yes, that would explain the errors I suppose.

I don't suppose this could be extracted into a testable function, so we can catch future regressions?

review: Approve

[Graham Binns (gmb)]

Yes, it can be, I think. The whole of main.py needs some testing love though, so we'll do that elsewhere.

=== modified file 'maastest/main.py'
--- maastest/main.py	2014-01-06 07:53:25 +0000
+++ maastest/main.py	2014-01-08 10:34:05 +0000
@@ -97,7 +97,7 @@
         raise
     from maastest import report
     encoded_results = (
-        output_stream.buffer.getvalue().encode('utf-8'))
+        output_stream.cache.getvalue().encode('utf-8'))
     if not args.no_reporting:
         report.report_test_results(
             encoded_results, log_only=args.log_results_only)