Merge branch 'master' into storage_issue_286

tests/unit/test_blob.py

@@ -1996,6 +1996,10 @@ def test__do_multipart_upload_with_client(self, mock_get_boundary):
         client._connection.API_BASE_URL = "https://storage.googleapis.com"
         self._do_multipart_success(mock_get_boundary, client=client)
 
+    @mock.patch(u"google.resumable_media._upload.get_boundary", return_value=b"==0==")
+    def test__do_multipart_upload_with_metadata(self, mock_get_boundary):
+        self._do_multipart_success(mock_get_boundary, metadata={"test": "test"})
+
     def test__do_multipart_upload_bad_size(self):
         blob = self._make_one(u"blob-name", bucket=None)