3551: Revert "3551: When testing keep clients, write keepstore/keepproxy logs to"

This reverts commit 63871346153fea194b169eec38f6efae3061ebf6.

The default Popen behavior is to use stderr, and that's fine. This was
a mistaken attempt to reveal missing logs, the real solution for which
is 5fcff4c13ae17527ee1efd6fa01d08133212085b.

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 92497020ac76ab7a1f4efd162d0737b5753eff43..8ac34b8ce2b3b90a334bb08a04aa2a5c6147e541 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -28,8 +28,6 @@ if 'GOPATH' in os.environ:
     gobins = [os.path.join(path, 'bin') for path in gopaths]
     os.environ['PATH'] = ':'.join(gobins) + ':' + os.environ['PATH']
 
-logfile = None
-
 def find_server_pid(PID_PATH, wait=10):
     now = time.time()
     timeout = now + wait
@@ -148,7 +146,7 @@ def _start_keep(n, keep_args):
     for arg, val in keep_args.iteritems():
         keep_cmd.append("{}={}".format(arg, val))
 
-    kp0 = subprocess.Popen(keep_cmd, stderr=log_stream())
+    kp0 = subprocess.Popen(keep_cmd)
     with open("tmp/keep{}.pid".format(n), 'w') as f:
         f.write(str(kp0.pid))
 
@@ -211,8 +209,7 @@ def run_keep_proxy(auth):
     os.environ["ARVADOS_API_TOKEN"] = fixture("api_client_authorizations")[auth]["api_token"]
 
     kp0 = subprocess.Popen(["keepproxy",
-                            "-pid=tmp/keepproxy.pid", "-listen=:{}".format(25101)],
-                           stderr=log_stream())
+                            "-pid=tmp/keepproxy.pid", "-listen=:{}".format(25101)])
 
     authorize_with("admin")
     api = arvados.api('v1', cache=False)
@@ -223,16 +220,6 @@ def run_keep_proxy(auth):
 def stop_keep_proxy():
     kill_server_pid("tmp/keepproxy.pid", 0)
 
-def log_stream():
-    global logfile
-    if not os.path.exists("tmp"):
-        os.mkdir("tmp")
-    if not logfile:
-        logpath = os.path.join(os.getcwd(), 'tmp', 'run_test_server.log')
-        logfile = open(logpath, 'a')
-        print >>sys.stderr, "Saving Keep server log messages to %s" % (logpath,)
-    return logfile
-
 def fixture(fix):
     '''load a fixture yaml file'''
     with open(os.path.join(SERVICES_SRC_DIR, 'api', "test", "fixtures",