From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 23 Dec 2013 18:46:36 +0000 (+0000)
Subject: Merge "Set volume_dd_blocksize configurable on per-driver basis"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8a5ce963dc9b96f485536ab851ef0e2a1d0e8313;p=openstack-build%2Fcinder-build.git

Merge "Set volume_dd_blocksize configurable on per-driver basis"
---

8a5ce963dc9b96f485536ab851ef0e2a1d0e8313
diff --cc cinder/tests/test_volume.py
index 8ef886fc9,a18b4e12e..9cb552246
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@@ -1533,10 -1498,11 +1533,11 @@@ class VolumeTestCase(BaseVolumeTestCase
                                        image_service, image_id):
              pass
  
-         def fake_fetch_to_raw(ctx, image_service, image_id, path, size=None):
+         def fake_fetch_to_raw(ctx, image_service, image_id, path, blocksize,
+                               size=None):
              pass
  
 -        def fake_clone_image(volume_ref, image_location, image_id):
 +        def fake_clone_image(volume_ref, image_location, image_id, image_meta):
              return {'provider_location': None}, True
  
          dst_fd, dst_path = tempfile.mkstemp()