From 6bccfc0d6eb24abe228f58767818d54d9717850b Mon Sep 17 00:00:00 2001 From: Victoria Martinez de la Cruz Date: Fri, 10 Jan 2020 20:43:31 +0000 Subject: [PATCH] Put osc unit tests with all other unit tests Having osc in an upper level module meant that all osc unit tests were not being run. We had two options: either create a new job purely for osc unit tests or put all tests on the same module. The latter made more sense for simplicity reasons (KISS) Change-Id: Iabf76d8ac7ef886d736f3e30d466fe3f992287da --- manilaclient/tests/osc/unit/v2/__init__.py | 0 manilaclient/tests/{ => unit}/osc/__init__.py | 0 manilaclient/tests/{osc/unit => unit/osc}/osc_fakes.py | 0 manilaclient/tests/{osc/unit => unit/osc}/osc_utils.py | 0 manilaclient/tests/{osc/unit => unit/osc/v2}/__init__.py | 0 manilaclient/tests/{osc/unit => unit/osc}/v2/fakes.py | 4 ++-- manilaclient/tests/{osc/unit => unit/osc}/v2/test_share.py | 4 ++-- 7 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 manilaclient/tests/osc/unit/v2/__init__.py rename manilaclient/tests/{ => unit}/osc/__init__.py (100%) rename manilaclient/tests/{osc/unit => unit/osc}/osc_fakes.py (100%) rename manilaclient/tests/{osc/unit => unit/osc}/osc_utils.py (100%) rename manilaclient/tests/{osc/unit => unit/osc/v2}/__init__.py (100%) rename manilaclient/tests/{osc/unit => unit/osc}/v2/fakes.py (98%) rename manilaclient/tests/{osc/unit => unit/osc}/v2/test_share.py (99%) diff --git a/manilaclient/tests/osc/unit/v2/__init__.py b/manilaclient/tests/osc/unit/v2/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/manilaclient/tests/osc/__init__.py b/manilaclient/tests/unit/osc/__init__.py similarity index 100% rename from manilaclient/tests/osc/__init__.py rename to manilaclient/tests/unit/osc/__init__.py diff --git a/manilaclient/tests/osc/unit/osc_fakes.py b/manilaclient/tests/unit/osc/osc_fakes.py similarity index 100% rename from manilaclient/tests/osc/unit/osc_fakes.py rename to manilaclient/tests/unit/osc/osc_fakes.py diff --git a/manilaclient/tests/osc/unit/osc_utils.py b/manilaclient/tests/unit/osc/osc_utils.py similarity index 100% rename from manilaclient/tests/osc/unit/osc_utils.py rename to manilaclient/tests/unit/osc/osc_utils.py diff --git a/manilaclient/tests/osc/unit/__init__.py b/manilaclient/tests/unit/osc/v2/__init__.py similarity index 100% rename from manilaclient/tests/osc/unit/__init__.py rename to manilaclient/tests/unit/osc/v2/__init__.py diff --git a/manilaclient/tests/osc/unit/v2/fakes.py b/manilaclient/tests/unit/osc/v2/fakes.py similarity index 98% rename from manilaclient/tests/osc/unit/v2/fakes.py rename to manilaclient/tests/unit/osc/v2/fakes.py index 04370178c..a0f0937d3 100644 --- a/manilaclient/tests/osc/unit/v2/fakes.py +++ b/manilaclient/tests/unit/osc/v2/fakes.py @@ -18,8 +18,8 @@ import uuid from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes -from manilaclient.tests.osc.unit import osc_fakes -from manilaclient.tests.osc.unit import osc_utils +from manilaclient.tests.unit.osc import osc_fakes +from manilaclient.tests.unit.osc import osc_utils class FakeShareClient(object): diff --git a/manilaclient/tests/osc/unit/v2/test_share.py b/manilaclient/tests/unit/osc/v2/test_share.py similarity index 99% rename from manilaclient/tests/osc/unit/v2/test_share.py rename to manilaclient/tests/unit/osc/v2/test_share.py index 3a9ceb263..026544af1 100644 --- a/manilaclient/tests/osc/unit/v2/test_share.py +++ b/manilaclient/tests/unit/osc/v2/test_share.py @@ -22,8 +22,8 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes from manilaclient.common import cliutils from manilaclient.osc.v2 import share as osc_shares -from manilaclient.tests.osc.unit import osc_utils -from manilaclient.tests.osc.unit.v2 import fakes as manila_fakes +from manilaclient.tests.unit.osc import osc_utils +from manilaclient.tests.unit.osc.v2 import fakes as manila_fakes class TestShare(manila_fakes.TestShare):