1
=== modified file 'NEWS'
2
--- NEWS	2010-09-16 07:12:32 +0000
3
+++ NEWS	2010-09-17 05:27:47 +0000
4
@@ -75,10 +75,10 @@
5
75
*******
75
*******
6
76
76
7
77
* Tracebacks from a parameterized test are no longer reported against every
77
* Tracebacks from a parameterized test are no longer reported against every
12
78
  parameterization of that test.  This was done by adding a custom
78
  parameterization of that test.  This was done by adding a hack to
13
79
  ``__copy__`` method to TestCase, so that ``multiply_tests`` no longer
79
  ``bzrlib.tests.clone_test`` so that it no longer causes
14
80
  causes testtools.TestCase instances to share a details dict (or other
80
  testtools.TestCase instances to share a details dict.
15
81
  mutable attributes).  (Andrew Bennetts, #625574)
81
  (Andrew Bennetts, #625574)
16
82
82
17
83
83
18
84
bzr 2.2
84
bzr 2.2
19
85
85
20
=== modified file 'bzrlib/tests/__init__.py'
21
--- bzrlib/tests/__init__.py	2010-09-15 06:44:55 +0000
22
+++ bzrlib/tests/__init__.py	2010-09-17 05:27:47 +0000
23
@@ -799,15 +799,6 @@
24
799
    _log_file_name = None
799
    _log_file_name = None
25
800
    # record lsprof data when performing benchmark calls.
800
    # record lsprof data when performing benchmark calls.
26
801
    _gather_lsprof_in_benchmarks = False
801
    _gather_lsprof_in_benchmarks = False
27
802
    # Mutable attributes defined in bzrlib.tests.TestCase and
28
803
    # testtools.TestCase that should not be shallow copied by clone_test.
29
804
    # This is ugly, but probably the best we can do until testtools provide a
30
805
    # nicer way to deal with this, see
31
806
    # <https://bugs.launchpad.net/testtools/+bug/637725>.
32
807
    _attrs_to_deepcopy = (
33
808
        '_cleanups', 'exception_handlers', '_unique_id_gen',
34
809
        '_traceback_id_gen', '_TestCase__details',
35
810
        '_TestCase__exception_handlers')
36
811
802
37
812
    def __init__(self, methodName='testMethod'):
803
    def __init__(self, methodName='testMethod'):
38
813
        super(TestCase, self).__init__(methodName)
804
        super(TestCase, self).__init__(methodName)
39
@@ -818,25 +809,6 @@
40
818
        self.exception_handlers.insert(0,
809
        self.exception_handlers.insert(0,
41
819
            (TestNotApplicable, self._do_not_applicable))
810
            (TestNotApplicable, self._do_not_applicable))
42
820
811
43
821
    def __copy__(self):
44
822
        # XXX: This method works around the lack of a way to correctly clone a
45
823
        # test with current testtools.  See
46
824
        # <https://bugs.launchpad.net/testtools/+bug/637725>.
47
825
        # The work around is to:
48
826
        #  - shallow copy self.__dict__
49
827
        #  - deep copy individual attributes in the _attrs_to_deepcopy black
50
828
        #    list.
51
829
        #  - create a new instance (skipping __init__) with the new __dict__.
52
830
        attrs = self.__dict__.copy()
53
831
        for attr_name in self._attrs_to_deepcopy:
54
832
            if attr_name in attrs:
55
833
                attrs[attr_name] = copy.deepcopy(attrs[attr_name])
56
834
        # Some Python voodoo to create an instance without invoking its
57
835
        # __init__, because we've already constructed the __dict__ to use.
58
836
        new_instance = self.__class__.__new__(self.__class__)
59
837
        new_instance.__dict__ = attrs
60
838
        return new_instance
61
839
62
840
    def setUp(self):
812
    def setUp(self):
63
841
        super(TestCase, self).setUp()
813
        super(TestCase, self).setUp()
64
842
        for feature in getattr(self, '_test_needs_features', []):
814
        for feature in getattr(self, '_test_needs_features', []):
65
@@ -4080,6 +4052,18 @@
66
4080
    """
4052
    """
67
4081
    new_test = copy.copy(test)
4053
    new_test = copy.copy(test)
68
4082
    new_test.id = lambda: new_id
4054
    new_test.id = lambda: new_id
69
4055
    # XXX: Workaround <https://bugs.launchpad.net/testtools/+bug/637725>, which
70
4056
    # causes cloned tests to share the 'details' dict.  This makes it hard to
71
4057
    # read the test output for parameterized tests, because tracebacks will be
72
4058
    # associated with irrelevant tests.
73
4059
    try:
74
4060
        details = new_test._TestCase__details
75
4061
    except AttributeError:
76
4062
        # must be a different version of testtools than expected.  Do nothing.
77
4063
        pass
78
4064
    else:
79
4065
        # Reset the '__details' dict.
80
4066
        new_test._TestCase__details = {}
81
4083
    return new_test
4067
    return new_test
82
4084
4068
83
4085
4069
Reviewer	Review Type	Date Requested	Status
Martin Pool		2010-09-17	Approve on 2010-09-17
Review via email: mp+35778@code.launchpad.net