Merge lp:~jml/python-fixtures/busted-combine-details into lp:~python-fixtures/python-fixtures/trunk

[Jonathan Lange]

Fixes an obvious (i.e. pyflakes caught it) error in fixtures/fixture.py where combine_details would explode given duplicate names of details. I've added a test to catch it.

[Robert Collins (lifeless)]

Thanks for this. It was missing a NEWS entry.

=== modified file 'lib/fixtures/fixture.py'
--- lib/fixtures/fixture.py	2011-07-26 23:07:48 +0000
+++ lib/fixtures/fixture.py	2011-11-25 18:00:48 +0000
@@ -23,7 +23,10 @@
 import itertools
 import sys
 
-from testtools.compat import reraise
+from testtools.compat import (
+    advance_iterator,
+    reraise,
+    )
 from testtools.helpers import try_import
 
 class MultipleExceptions(Exception):

=== modified file 'lib/fixtures/tests/test_fixture.py'
--- lib/fixtures/tests/test_fixture.py	2011-06-23 07:56:42 +0000
+++ lib/fixtures/tests/test_fixture.py	2011-11-25 18:00:48 +0000
@@ -163,6 +163,18 @@
             child.addDetail('foo', 'content')
         self.assertEqual({}, parent.getDetails())
 
+    def test_duplicate_details_are_disambiguated(self):
+        parent = fixtures.Fixture()
+        with parent:
+            parent.addDetail('foo', 'parent-content')
+            child = fixtures.Fixture()
+            parent.useFixture(child)
+            # Note that we add the detail *after* using the fixture: the parent
+            # has to query just-in-time.
+            child.addDetail('foo', 'child-content')
+            self.assertEqual({'foo': 'parent-content',
+                              'foo-1': 'child-content',}, parent.getDetails())
+
     def test_addDetail(self):
         fixture = fixtures.Fixture()
         with fixture: