Swap stdout/stderr -- debug messages then go to stderr, and yaml data to stdout

diff --git a/s3tests/common/__init__.py b/s3tests/common/__init__.py
index a64fe1092de45c2d83bc3643a54e70ebd4769810..8eb4232373d60a8c30441556b3f2233321691cad 100644 (file)
--- a/s3tests/common/__init__.py
+++ b/s3tests/common/__init__.py
@@ -4,6 +4,7 @@ import itertools
 import os
 import random
 import string
+import sys
 import yaml
 
 s3 = bunch.Bunch()
@@ -13,6 +14,10 @@ prefix = ''
 # For those scripts that use a context, these are pretty univerally needed.
 context = bunch.Bunch(
     bucket = None,
+
+    # Save stdout/stderr in case they get fudged with.
+    real_stdout = sys.stdout,
+    real_stderr = sys.stderr,
 )
 
 bucket_counter = itertools.count(1)

diff --git a/s3tests/common/results.py b/s3tests/common/results.py
index 2a3da100aeaa12e77b043b93945cbf9e9e76e9f9..b9aa9ce7fb1c7e8e1ddde8f0946580fbfdefd733 100644 (file)
--- a/s3tests/common/results.py
+++ b/s3tests/common/results.py
@@ -93,7 +93,7 @@ class ResultsLogger(gevent.Greenlet):
     """ A quick little greenlet to always run and dump results. """
     def __init__(self):
         gevent.Greenlet.__init__(self)
-        self.outfile = sys.stderr
+        self.outfile = context.real_stdout
 
     def _run(self):
         while True:

diff --git a/s3tests/roundtrip.py b/s3tests/roundtrip.py
index c69fb9418de74ccf53dea66235a0b900ea451b52..69b35a1ae19c0cc63289cc633c1a235e6608f381 100644 (file)
--- a/s3tests/roundtrip.py
+++ b/s3tests/roundtrip.py
@@ -10,6 +10,7 @@ import random
 import realistic
 import time
 import traceback
+import sys
 
 import common
 from common import context, config
@@ -86,6 +87,7 @@ def _main():
 
 
 def main():
+    sys.stdout = sys.stderr # Original steam already saved by common
     common.setup()
     setup()