openstack/deb-cinder
Code Issues Proposed changes

Merge "fix invalid uuid in emc extremio unit tests"

Browse Source
This commit is contained in:
Jenkins 2016-04-30 21:58:55 +00:00 committed by Gerrit Code Review
commit 2b330c02c3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/fake_constants.py
View File

@ -32,7 +32,8 @@ cgsnapshot3_id = '5f392156-fc03-492a-9cb8-e46a7eedaf33'
CGSNAPSHOT3_ID = '5f392156-fc03-492a-9cb8-e46a7eedaf33'
consistency_group_id = 'f18abf73-79ee-4f2b-8d4f-1c044148f117'
CONSISTENCY_GROUP_ID = 'f18abf73-79ee-4f2b-8d4f-1c044148f117'
CONSISTENCY_GROUP2_ID = '9fe852ac-d42d-4772-a8ae-c2bb6f7fb31c'
consistency_group2_id = '8afc8952-9dce-4228-9f8a-706c5cb5fc82'
CONSISTENCY_GROUP2_ID = '8afc8952-9dce-4228-9f8a-706c5cb5fc82'
image_id = 'e79161cd-5f9d-4007-8823-81a807a64332'
IMAGE_ID = 'e79161cd-5f9d-4007-8823-81a807a64332'
instance_id = 'fa617131-cdbc-45dc-afff-f21f17ae054e'

4
cinder/tests/unit/test_emc_xtremio.py
View File

@ -21,6 +21,7 @@ import six
from cinder import exception
from cinder import test
from cinder.tests.unit import fake_consistencygroup as fake_cg
from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit import fake_snapshot
from cinder.tests.unit import fake_volume
from cinder.volume.drivers.emc import xtremio
@ -622,7 +623,8 @@ class EMCXIODriverISCSITestCase(test.TestCase):
[new_vol1],
d.cgsnapshot, [snapshot1])
new_cg_obj = fake_cg.fake_consistencyobject_obj(d.context, id=5)
new_cg_obj = fake_cg.fake_consistencyobject_obj(
d.context, id=fake.CONSISTENCY_GROUP2_ID)
snapset2_name = new_cg_obj.id
new_vol1.id = '192eb39b-6c2f-420c-bae3-3cfd117f0001'
new_vol2 = fake_volume.fake_volume_obj(d.context)