Merge pull request #166 from emgerner-msft/dev

fixes

Author: emgerner-msft

azure/storage/blob/blockblobservice.py

@@ -27,6 +27,7 @@
 from .._serialization import (
     _get_request_body,
     _get_request_body_bytes_only,
+    _add_metadata_headers,
 )
 from .._http import HTTPRequest
 from ._upload_chunking import (
@@ -197,7 +198,7 @@ def _put_blob(self, container_name, blob_name, blob, content_settings=None,
             ('If-Match', _to_str(if_match)),
             ('If-None-Match', _to_str(if_none_match))
         ]
-        _metadata_to_headers(metadata, request)
+        _add_metadata_headers(metadata, request)
         if content_settings is not None:
             request.headers += content_settings._to_headers()
         request.body = _get_request_body_bytes_only('blob', blob)
@@ -344,7 +345,7 @@ def put_block_list(
             ('If-Match', _to_str(if_match)),
             ('If-None-Match', _to_str(if_none_match)),
         ]
-        _metadata_to_headers(metadata, request)
+        _add_metadata_headers(metadata, request)
         if content_settings is not None:
             request.headers += content_settings._to_headers()
         request.body = _get_request_body(

azure/storage/blob/pageblobservice.py

@@ -25,6 +25,7 @@
 )
 from .._serialization import (
     _get_request_body_bytes_only,
+    _add_metadata_headers,
 )
 from .._http import HTTPRequest
 from ._error import (
@@ -200,7 +201,7 @@ def create_blob(
             ('If-Match', _to_str(if_match)),
             ('If-None-Match', _to_str(if_none_match))
         ]
-        _metadata_to_headers(metadata, request)
+        _add_metadata_headers(metadata, request)
         if content_settings is not None:
             request.headers += content_settings._to_headers()
 

tests/test_common_blob.py

@@ -304,21 +304,6 @@ def test_get_blob_with_range(self):
         self.assertIsInstance(blob, Blob)
         self.assertEqual(blob.content, self.byte_data[:6])
 
-    @record
-    def test_get_blob_with_range_and_get_content_md5(self):
-        # Arrange
-        blob_name = self._create_block_blob()
-
-        # Act
-        blob = self.bs.get_blob_to_bytes(self.container_name, blob_name,
-                                start_range=0, end_range=5,
-                                range_get_content_md5=True)
-
-        # Assert
-        self.assertIsInstance(blob, Blob)
-        self.assertEqual(blob.content, self.byte_data[:6])
-        self.assertIsNotNone(blob.properties.content_settings.content_md5)
-
     @record
     def test_get_blob_with_lease(self):
         # Arrange