From d24d425c1521fa392697f46bcb09340383a1de4a Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Thu, 26 May 2016 16:45:51 +0300 Subject: [PATCH] Move consistency groups tests to consistencygroup directory Change-Id: I883f1ef42ae60c5b62f6d2a951a6a8b2079b772e --- cinder/tests/unit/consistencygroup/__init__.py | 0 cinder/tests/unit/{ => consistencygroup}/fake_cgsnapshot.py | 0 .../unit/{ => consistencygroup}/fake_consistencygroup.py | 0 cinder/tests/unit/{ => consistencygroup}/test_cg.py | 0 cinder/tests/unit/objects/test_volume.py | 2 +- cinder/tests/unit/scheduler/test_scheduler.py | 2 +- cinder/tests/unit/test_emc_vnx.py | 4 ++-- cinder/tests/unit/test_emc_xtremio.py | 2 +- .../unit/volume/drivers/emc/scaleio/test_consistencygroups.py | 2 +- cinder/tests/unit/volume/flows/test_create_volume_flow.py | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 cinder/tests/unit/consistencygroup/__init__.py rename cinder/tests/unit/{ => consistencygroup}/fake_cgsnapshot.py (100%) rename cinder/tests/unit/{ => consistencygroup}/fake_consistencygroup.py (100%) rename cinder/tests/unit/{ => consistencygroup}/test_cg.py (100%) diff --git a/cinder/tests/unit/consistencygroup/__init__.py b/cinder/tests/unit/consistencygroup/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/cinder/tests/unit/fake_cgsnapshot.py b/cinder/tests/unit/consistencygroup/fake_cgsnapshot.py similarity index 100% rename from cinder/tests/unit/fake_cgsnapshot.py rename to cinder/tests/unit/consistencygroup/fake_cgsnapshot.py diff --git a/cinder/tests/unit/fake_consistencygroup.py b/cinder/tests/unit/consistencygroup/fake_consistencygroup.py similarity index 100% rename from cinder/tests/unit/fake_consistencygroup.py rename to cinder/tests/unit/consistencygroup/fake_consistencygroup.py diff --git a/cinder/tests/unit/test_cg.py b/cinder/tests/unit/consistencygroup/test_cg.py similarity index 100% rename from cinder/tests/unit/test_cg.py rename to cinder/tests/unit/consistencygroup/test_cg.py diff --git a/cinder/tests/unit/objects/test_volume.py b/cinder/tests/unit/objects/test_volume.py index 49a2f541f..6c5d87557 100644 --- a/cinder/tests/unit/objects/test_volume.py +++ b/cinder/tests/unit/objects/test_volume.py @@ -19,7 +19,7 @@ import six from cinder import context from cinder import exception from cinder import objects -from cinder.tests.unit import fake_consistencygroup +from cinder.tests.unit.consistencygroup import fake_consistencygroup from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_snapshot from cinder.tests.unit import fake_volume diff --git a/cinder/tests/unit/scheduler/test_scheduler.py b/cinder/tests/unit/scheduler/test_scheduler.py index bc441f449..c2afeb6e6 100644 --- a/cinder/tests/unit/scheduler/test_scheduler.py +++ b/cinder/tests/unit/scheduler/test_scheduler.py @@ -29,7 +29,7 @@ from cinder.scheduler import driver from cinder.scheduler import filter_scheduler from cinder.scheduler import manager from cinder import test -from cinder.tests.unit import fake_consistencygroup +from cinder.tests.unit.consistencygroup import fake_consistencygroup from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_volume from cinder.tests.unit import utils as tests_utils diff --git a/cinder/tests/unit/test_emc_vnx.py b/cinder/tests/unit/test_emc_vnx.py index 6d3f0bf69..a0785d5ee 100644 --- a/cinder/tests/unit/test_emc_vnx.py +++ b/cinder/tests/unit/test_emc_vnx.py @@ -26,8 +26,8 @@ from cinder import context from cinder import exception from cinder.objects import fields from cinder import test -from cinder.tests.unit import fake_cgsnapshot -from cinder.tests.unit import fake_consistencygroup +from cinder.tests.unit.consistencygroup import fake_cgsnapshot +from cinder.tests.unit.consistencygroup import fake_consistencygroup from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_snapshot from cinder.tests.unit import fake_volume diff --git a/cinder/tests/unit/test_emc_xtremio.py b/cinder/tests/unit/test_emc_xtremio.py index 464572e02..20ff73a85 100644 --- a/cinder/tests/unit/test_emc_xtremio.py +++ b/cinder/tests/unit/test_emc_xtremio.py @@ -20,7 +20,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.consistencygroup 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 diff --git a/cinder/tests/unit/volume/drivers/emc/scaleio/test_consistencygroups.py b/cinder/tests/unit/volume/drivers/emc/scaleio/test_consistencygroups.py index df2301422..17fd546b2 100644 --- a/cinder/tests/unit/volume/drivers/emc/scaleio/test_consistencygroups.py +++ b/cinder/tests/unit/volume/drivers/emc/scaleio/test_consistencygroups.py @@ -18,7 +18,7 @@ import json import mock from cinder import context -from cinder.tests.unit import fake_consistencygroup +from cinder.tests.unit.consistencygroup import fake_consistencygroup from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_snapshot from cinder.tests.unit import fake_volume diff --git a/cinder/tests/unit/volume/flows/test_create_volume_flow.py b/cinder/tests/unit/volume/flows/test_create_volume_flow.py index 7f6cc0375..8fc29572d 100644 --- a/cinder/tests/unit/volume/flows/test_create_volume_flow.py +++ b/cinder/tests/unit/volume/flows/test_create_volume_flow.py @@ -22,7 +22,7 @@ from oslo_utils import imageutils from cinder import context from cinder import exception from cinder import test -from cinder.tests.unit import fake_consistencygroup +from cinder.tests.unit.consistencygroup import fake_consistencygroup from cinder.tests.unit import fake_snapshot from cinder.tests.unit import fake_volume from cinder.tests.unit.image import fake as fake_image