From dbfaad99bd1e3f88b03cef7852edabee44d284f7 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 8 Apr 2019 12:26:08 +0200
Subject: [PATCH] Move tobiko.common.managers.fixture to tobiko.common package.

Change-Id: Iaa6962df2c1a28ae348eb6d2e690ff8b2ae17b84
---
 tobiko/__init__.py                            | 34 +++++++++----------
 .../{managers/fixture.py => _fixture.py}      |  9 ++++-
 2 files changed, 25 insertions(+), 18 deletions(-)
 rename tobiko/common/{managers/fixture.py => _fixture.py} (96%)

diff --git a/tobiko/__init__.py b/tobiko/__init__.py
index 152edb1d5..15eb24e2a 100644
--- a/tobiko/__init__.py
+++ b/tobiko/__init__.py
@@ -14,33 +14,33 @@ from __future__ import absolute_import
 
 from tobiko.common import _asserts
 from tobiko.common import _exception
-from tobiko.common.managers import fixture
+from tobiko.common import _fixture
 from tobiko.common.managers import testcase as testcase_manager
 from tobiko.common.managers import loader as loader_manager
 from tobiko.common import _skip
 
 
+FailureException = _asserts.FailureException
+fail = _asserts.fail
+
+TobikoException = _exception.TobikoException
+
+is_fixture = _fixture.is_fixture
+get_fixture = _fixture.get_fixture
+get_fixture_name = _fixture.get_fixture_name
+get_fixture_class = _fixture.get_fixture_class
+get_fixture_dir = _fixture.get_fixture_dir
+remove_fixture = _fixture.remove_fixture
+setup_fixture = _fixture.setup_fixture
+cleanup_fixture = _fixture.cleanup_fixture
+list_required_fixtures = _fixture.list_required_fixtures
+SharedFixture = _fixture.SharedFixture
+
 load_object = loader_manager.load_object
 load_module = loader_manager.load_module
 
 discover_testcases = testcase_manager.discover_testcases
 
-is_fixture = fixture.is_fixture
-get_fixture = fixture.get_fixture
-get_fixture_name = fixture.get_fixture_name
-get_fixture_class = fixture.get_fixture_class
-get_fixture_dir = fixture.get_fixture_dir
-remove_fixture = fixture.remove_fixture
-setup_fixture = fixture.setup_fixture
-cleanup_fixture = fixture.cleanup_fixture
-list_required_fixtures = fixture.list_required_fixtures
-SharedFixture = fixture.SharedFixture
-
-TobikoException = _exception.TobikoException
-
-FailureException = _asserts.FailureException
-fail = _asserts.fail
-
 SkipException = _skip.SkipException
 skip = _skip.skip
 skip_if = _skip.skip_if
diff --git a/tobiko/common/managers/fixture.py b/tobiko/common/_fixture.py
similarity index 96%
rename from tobiko/common/managers/fixture.py
rename to tobiko/common/_fixture.py
index c1c912c75..8f5a78c78 100644
--- a/tobiko/common/managers/fixture.py
+++ b/tobiko/common/_fixture.py
@@ -19,6 +19,7 @@ import inspect
 import fixtures
 from oslo_log import log
 import six
+import testtools
 
 import tobiko
 
@@ -73,7 +74,13 @@ def remove_fixture(obj, manager=None):
 def setup_fixture(obj, manager=None):
     fixture = get_fixture(obj, manager=manager)
     LOG.debug('Set up fixture %r', get_fixture_name(fixture))
-    fixture.setUp()
+    try:
+        fixture.setUp()
+    except testtools.MultipleExceptions as ex:
+        for exc_info in ex.args[1:]:
+            LOG.exception("Error setting up fixture %r",
+                          fixture.fixture_name, exc_info=exc_info)
+        six.reraise(*ex.args[0])
     return fixture