From faaffef220e14a0d6c35817be38de24f3d2fc8c8 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 30 Jan 2014 16:41:31 -0800 Subject: [PATCH] flatten package hierarchy Change-Id: I8b8e4aa7cbaa181a3816335eb4940efc1d5f308b --- oslo/test/{fixture => }/mockpatch.py | 0 oslo/test/{fixture => }/moxstubout.py | 0 tests/unit/fixture/__init__.py | 0 tests/unit/{fixture => }/test_mockpatch.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename oslo/test/{fixture => }/mockpatch.py (100%) rename oslo/test/{fixture => }/moxstubout.py (100%) delete mode 100644 tests/unit/fixture/__init__.py rename tests/unit/{fixture => }/test_mockpatch.py (97%) diff --git a/oslo/test/fixture/mockpatch.py b/oslo/test/mockpatch.py similarity index 100% rename from oslo/test/fixture/mockpatch.py rename to oslo/test/mockpatch.py diff --git a/oslo/test/fixture/moxstubout.py b/oslo/test/moxstubout.py similarity index 100% rename from oslo/test/fixture/moxstubout.py rename to oslo/test/moxstubout.py diff --git a/tests/unit/fixture/__init__.py b/tests/unit/fixture/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/unit/fixture/test_mockpatch.py b/tests/unit/test_mockpatch.py similarity index 97% rename from tests/unit/fixture/test_mockpatch.py rename to tests/unit/test_mockpatch.py index b3ec9ea..abff9bd 100644 --- a/tests/unit/fixture/test_mockpatch.py +++ b/tests/unit/test_mockpatch.py @@ -16,7 +16,7 @@ import mock from oslo.test import base -from oslo.test.fixture import mockpatch +from oslo.test import mockpatch class Foo(object):