Merge branch 'master' into 4823-python-sdk-writable-collection-api

Conflicts:
	sdk/python/tests/arvados_testutil.py
	services/fuse/arvados_fuse/__init__.py

diff --cc sdk/python/tests/arvados_testutil.py
index aa0da982be2ed831982a6dccd22899f185eddb11,378e93f3861633f82af2b253515877833c21052d..2926b20bfa9608d649cac04cfa0ae35268a5ca10
--- 1/sdk/python/tests/arvados_testutil.py
--- 2/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@@ -40,30 -53,17 +53,30 @@@ def fake_requests_response(code, body, 
      r.raw = io.BytesIO(body)
      return r
  
-         m.return_value.put.side_effect = (fake_requests_response(code, b, **headers) for b, code in codes)
 +def mock_put_responses(body, *codes, **headers):
 +    m = mock.MagicMock()
 +    if isinstance(body, tuple):
 +        codes = list(codes)
 +        codes.insert(0, body)
-         m.return_value.put.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
++        m.return_value.put.side_effect = queue_with((fake_requests_response(code, b, **headers) for b, code in codes))
 +    else:
++        m.return_value.put.side_effect = queue_with((fake_requests_response(code, body, **headers) for code in codes))
 +    return mock.patch('requests.Session', m)
 +
  def mock_get_responses(body, *codes, **headers):
 -    return mock.patch('requests.get', side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +    m = mock.MagicMock()
-     m.return_value.get.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
++    m.return_value.get.side_effect = queue_with((fake_requests_response(code, body, **headers) for code in codes))
 +    return mock.patch('requests.Session', m)
  
 -def mock_put_responses(body, *codes, **headers):
 -    return mock.patch('requests.put', side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +def mock_get(side_effect):
 +    m = mock.MagicMock()
 +    m.return_value.get.side_effect = side_effect
 +    return mock.patch('requests.Session', m)
  
 -def mock_requestslib_responses(method, body, *codes, **headers):
 -    return mock.patch(method, side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +def mock_put(side_effect):
 +    m = mock.MagicMock()
 +    m.return_value.put.side_effect = side_effect
 +    return mock.patch('requests.Session', m)
  
  class MockStreamReader(object):
      def __init__(self, name='.', *data):

diff --cc sdk/python/tests/test_collections.py
index 5baf30aaaeff0f42822b46b80e43604e65469050,dbbe3f5e73deca582b65f42900f8181e52a63a02..8e513c611366ff5d1e5ad6491a43804044d8f4b3
--- 1/sdk/python/tests/test_collections.py
--- 2/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@@ -721,12 -718,12 +721,12 @@@ class CollectionWriterTestCase(unittest
      def test_write_three_replicas(self):
          client = mock.MagicMock(name='api_client')
          self.mock_keep_services(client, status=200, service_type='disk', count=6)
 -        writer = self.foo_writer(api_client=client, replication=3)
          with self.mock_keep(
-                 None, 200, 500, 200, 500, 200, 200,
+                 None, 500, 500, 500, 200, 200, 200,
                  **{'x-keep-replicas-stored': 1}) as keepmock:
 +            writer = self.foo_writer(api_client=client, replication=3)
              writer.manifest_text()
-             self.assertEqual(5, keepmock.call_count)
+             self.assertEqual(6, keepmock.call_count)
  
      def test_write_whole_collection_through_retries(self):
          writer = self.foo_writer(num_retries=2)

diff --cc services/fuse/arvados_fuse/__init__.py
Simple merge