summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Lange <jml@canonical.com>2011-07-26 23:43:16 +0100
committerJonathan Lange <jml@canonical.com>2011-07-26 23:43:16 +0100
commitedc267a404864260d7e11d586bec472598fa21ca (patch)
tree4eaa16f399b807ee5fbefa0b1f8689f705dddaf0
parent063ea50a5a85d7eba578b98d5d482cc51d31d178 (diff)
downloadfixtures-edc267a404864260d7e11d586bec472598fa21ca.tar.gz
Update to take testtools new API into account.
-rw-r--r--lib/fixtures/fixture.py2
-rw-r--r--lib/fixtures/testcase.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/fixtures/fixture.py b/lib/fixtures/fixture.py
index 14da061..9304602 100644
--- a/lib/fixtures/fixture.py
+++ b/lib/fixtures/fixture.py
@@ -199,7 +199,7 @@ class Fixture(object):
# The child failed to come up, capture any details it has (copying
# the content, it may go away anytime).
if gather_details is not None:
- gather_details(fixture, self)
+ gather_details(fixture.getDetails(), self._details)
raise
else:
self.addCleanup(fixture.cleanUp)
diff --git a/lib/fixtures/testcase.py b/lib/fixtures/testcase.py
index 0a6bb61..6a84ddf 100644
--- a/lib/fixtures/testcase.py
+++ b/lib/fixtures/testcase.py
@@ -45,7 +45,7 @@ class TestWithFixtures(unittest.TestCase):
except:
if use_details:
# Capture the details now, in case the fixture goes away.
- gather_details(fixture, self)
+ gather_details(fixture.getDetails(), self.getDetails())
raise
else:
self.addCleanup(fixture.cleanUp)