Просмотр исходного кода

Fixed buid issue with using StringIO in mock_azure_client

vikramdoda 9 лет назад
Родитель
Сommit
d7bb0b7f44

+ 3 - 3
cloudbridge/cloud/providers/azure/mock_azure_client.py

@@ -1,4 +1,4 @@
-from io import StringIO
+from io import BytesIO
 
 
 from azure.mgmt.compute.models import Disk, CreationData, DiskCreateOption
 from azure.mgmt.compute.models import Disk, CreationData, DiskCreateOption
 from azure.mgmt.network.models import NetworkSecurityGroup
 from azure.mgmt.network.models import NetworkSecurityGroup
@@ -175,8 +175,8 @@ class MockAzureClient:
     def get_blob_content(self, container_name, blob_name):
     def get_blob_content(self, container_name, blob_name):
         blob = self.get_blob(container_name, blob_name)
         blob = self.get_blob(container_name, blob_name)
         if blob.content:
         if blob.content:
-            output = StringIO()
-            output.write(blob.content)
+            output = BytesIO()
+            output.write(bytearray(blob.content,'UTF-8'))
             return output
             return output
 
 
         return None
         return None

+ 3 - 3
test/test_azure_object_store_service.py

@@ -123,7 +123,7 @@ class AzureObjectStoreServiceTestCase(ProviderTestBase):
         content = block.iter_content()
         content = block.iter_content()
         print("Iter content  - " + str(content))
         print("Iter content  - " + str(content))
         self.assertEqual(
         self.assertEqual(
-            content.getvalue(), 'blob2Content' )
+            content.getvalue(), b'blob2Content' )
 
 
     @helpers.skipIfNoService(['object_store'])
     @helpers.skipIfNoService(['object_store'])
     def test_azure_bucket_object_iter_content_ifBlobNotExists(self):
     def test_azure_bucket_object_iter_content_ifBlobNotExists(self):
@@ -142,7 +142,7 @@ class AzureObjectStoreServiceTestCase(ProviderTestBase):
         block = blocks[0]
         block = blocks[0]
         block.upload('blob1Content')
         block.upload('blob1Content')
         self.assertEqual(
         self.assertEqual(
-            block.iter_content().getvalue(), 'blob1Content')
+            block.iter_content().getvalue(), b'blob1Content')
 
 
     @helpers.skipIfNoService(['object_store'])
     @helpers.skipIfNoService(['object_store'])
     def test_azure_bucket_object_delete(self):
     def test_azure_bucket_object_delete(self):
@@ -163,7 +163,7 @@ class AzureObjectStoreServiceTestCase(ProviderTestBase):
         block = blocks[0]
         block = blocks[0]
         block.upload_from_file('blob2Content')
         block.upload_from_file('blob2Content')
         self.assertEqual(
         self.assertEqual(
-            block.iter_content().getvalue(), 'blob2Content')
+            block.iter_content().getvalue(), b'blob2Content')
 
 
 
 
     @helpers.skipIfNoService(['object_store'])
     @helpers.skipIfNoService(['object_store'])