[ARVADOS] updated: e4353b279406b9a85707b1838131b7da360cda4f

[git at public.curoverse.com]

Summary of changes:
 docker/build_tools/config.rb        |  2 --
 sdk/python/tests/run_test_server.py | 17 ++---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

       via  e4353b279406b9a85707b1838131b7da360cda4f (commit)
       via  36dd208f40c558481d1881f756cc2564d2ff91dc (commit)
      from  2a4e0d9bd4e46af87861c1b80e83a00cd99de399 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e4353b279406b9a85707b1838131b7da360cda4f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 14 10:05:41 2014 -0400

    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 9249702..8ac34b8 100644
--- 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",

commit 36dd208f40c558481d1881f756cc2564d2ff91dc
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 14 09:49:34 2014 -0400

    3551: Remove superfluous chmod(). Umask is 022 here.

diff --git a/docker/build_tools/config.rb b/docker/build_tools/config.rb
index 24d6ccb..d8bf256 100755
--- a/docker/build_tools/config.rb
+++ b/docker/build_tools/config.rb
@@ -49,8 +49,6 @@ Dir.glob(globdir + '/*.in') do |template_file|
   output_path = File.join(generated_dir, File.basename(template_file, '.in'))
   output_mode = (File.stat(template_file).mode & 0100) ? 0755 : 0644
   File.open(output_path, "w", output_mode) do |output|
-    # Set the mode again after opening, to thwart any prevailing umask:
-    output.chmod output_mode
     File.open(template_file) do |input|
       input.each_line do |line|
 

-----------------------------------------------------------------------


hooks/post-receive
--