Merge branch 'pr/28'

Closes #7324.

diff --combined sdk/python/tests/run_test_server.py
index d90d2ad1a7b61dd567bc6931c95a06b8d8463226,ca13fc7f193263b75cec187e870d6cfa261b5b73..d325b4eb6ecb086d15effa34bc26db3e95c9ad15
--- 1/sdk/python/tests/run_test_server.py
--- 2/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@@ -3,6 -3,7 +3,7 @@@
  from __future__ import print_function
  import argparse
  import atexit
+ import errno
  import httplib2
  import os
  import pipes
@@@ -54,9 -55,7 +55,7 @@@ def find_server_pid(PID_PATH, wait=10)
              with open(PID_PATH, 'r') as f:
                  server_pid = int(f.read())
              good_pid = (os.kill(server_pid, 0) is None)
-         except IOError:
-             good_pid = False
-         except OSError:
+         except EnvironmentError:
              good_pid = False
          now = time.time()
  
@@@ -91,9 -90,7 +90,7 @@@ def kill_server_pid(pidfile, wait=10, p
              os.getpgid(server_pid)
              time.sleep(0.1)
              now = time.time()
-     except IOError:
-         pass
-     except OSError:
+     except EnvironmentError:
          pass
  
  def find_available_port():
@@@ -310,9 -307,8 +307,9 @@@ def _start_keep(n, keep_args)
      for arg, val in keep_args.iteritems():
          keep_cmd.append("{}={}".format(arg, val))
  
 +    logf = open(os.path.join(TEST_TMPDIR, 'keep{}.log'.format(n)), 'a+')
      kp0 = subprocess.Popen(
 -        keep_cmd, stdin=open('/dev/null'), stdout=sys.stderr)
 +        keep_cmd, stdin=open('/dev/null'), stdout=logf, stderr=logf, close_fds=True)
      with open(_pidfile('keep{}'.format(n)), 'w') as f:
          f.write(str(kp0.pid))
  
@@@ -323,34 -319,28 +320,34 @@@
  
      return port
  
 -def run_keep(blob_signing_key=None, enforce_permissions=False):
 -    stop_keep()
 +def run_keep(blob_signing_key=None, enforce_permissions=False, num_servers=2):
 +    stop_keep(num_servers)
  
      keep_args = {}
 -    if blob_signing_key:
 -        with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f:
 -            keep_args['--permission-key-file'] = f.name
 -            f.write(blob_signing_key)
 +    if not blob_signing_key:
 +        blob_signing_key = 'zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc'
 +    with open(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"), "w") as f:
 +        keep_args['-blob-signing-key-file'] = f.name
 +        f.write(blob_signing_key)
      if enforce_permissions:
 -        keep_args['--enforce-permissions'] = 'true'
 +        keep_args['-enforce-permissions'] = 'true'
 +    with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f:
 +        keep_args['-data-manager-token-file'] = f.name
 +        f.write(os.environ['ARVADOS_API_TOKEN'])
 +    keep_args['-never-delete'] = 'false'
  
      api = arvados.api(
          version='v1',
          host=os.environ['ARVADOS_API_HOST'],
          token=os.environ['ARVADOS_API_TOKEN'],
          insecure=True)
 +
      for d in api.keep_services().list().execute()['items']:
          api.keep_services().delete(uuid=d['uuid']).execute()
      for d in api.keep_disks().list().execute()['items']:
          api.keep_disks().delete(uuid=d['uuid']).execute()
  
 -    for d in range(0, 2):
 +    for d in range(0, num_servers):
          port = _start_keep(d, keep_args)
          svc = api.keep_services().create(body={'keep_service': {
              'uuid': 'zzzzz-bi6l4-keepdisk{:07d}'.format(d),
@@@ -372,9 -362,9 +369,9 @@@ def _stop_keep(n)
      if os.path.exists(os.path.join(TEST_TMPDIR, "keep.blob_signing_key")):
          os.remove(os.path.join(TEST_TMPDIR, "keep.blob_signing_key"))
  
 -def stop_keep():
 -    _stop_keep(0)
 -    _stop_keep(1)
 +def stop_keep(num_servers=2):
 +    for n in range(0, num_servers):
 +        _stop_keep(n)
  
  def run_keep_proxy():
      if 'ARVADOS_TEST_PROXY_SERVICES' in os.environ:
@@@ -448,6 -438,7 +445,7 @@@ def run_nginx()
      nginxconf['GITSSLPORT'] = find_available_port()
      nginxconf['SSLCERT'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.pem')
      nginxconf['SSLKEY'] = os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'self-signed.key')
+     nginxconf['ACCESSLOG'] = os.path.join(TEST_TMPDIR, 'nginx_access_log.fifo')
  
      conftemplatefile = os.path.join(MY_DIRNAME, 'nginx.conf')
      conffile = os.path.join(TEST_TMPDIR, 'nginx.conf')
@@@ -459,12 -450,23 +457,23 @@@
  
      env = os.environ.copy()
      env['PATH'] = env['PATH']+':/sbin:/usr/sbin:/usr/local/sbin'
+ 
+     try:
+         os.remove(nginxconf['ACCESSLOG'])
+     except OSError as error:
+         if error.errno != errno.ENOENT:
+             raise
+ 
+     os.mkfifo(nginxconf['ACCESSLOG'], 0700)
      nginx = subprocess.Popen(
          ['nginx',
           '-g', 'error_log stderr info;',
           '-g', 'pid '+_pidfile('nginx')+';',
           '-c', conffile],
          env=env, stdin=open('/dev/null'), stdout=sys.stderr)
+     cat_access = subprocess.Popen(
+         ['cat', nginxconf['ACCESSLOG']],
+         stdout=sys.stderr)
      _setport('keepproxy-ssl', nginxconf['KEEPPROXYSSLPORT'])
      _setport('arv-git-httpd-ssl', nginxconf['GITSSLPORT'])
  
@@@ -596,9 -598,6 +605,9 @@@ if __name__ == "__main__"
      parser = argparse.ArgumentParser()
      parser.add_argument('action', type=str, help="one of {}".format(actions))
      parser.add_argument('--auth', type=str, metavar='FIXTURE_NAME', help='Print authorization info for given api_client_authorizations fixture')
 +    parser.add_argument('--num-keep-servers', metavar='int', type=int, default=2, help="Number of keep servers desired")
 +    parser.add_argument('--keep-enforce-permissions', action="store_true", help="Enforce keep permissions")
 +
      args = parser.parse_args()
  
      if args.action not in actions:
@@@ -618,7 -617,7 +627,7 @@@
      elif args.action == 'stop':
          stop(force=('ARVADOS_TEST_API_HOST' not in os.environ))
      elif args.action == 'start_keep':
 -        run_keep()
 +        run_keep(enforce_permissions=args.keep_enforce_permissions, num_servers=args.num_keep_servers)
      elif args.action == 'stop_keep':
          stop_keep()
      elif args.action == 'start_keep_proxy':