~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-04 09:09:37 UTC
  • mto: (5005.1.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5007.
  • Revision ID: v.ladeuil+lp@free.fr-20100204090937-bjsmdktvv8mhlzpa
Avoid infinite recursion when probing for apport.

* bzrlib/tests/test_crash.py:
(TestApportDeprecation): Reproduce bug #516934 leading to an
infinite recursion when apport is available.

* bzrlib/tests/test_selftest.py:
(simple_thunk_feature): Use the new signature for
_CompatabilityThunkFeature.

* bzrlib/tests/features.py:
(ApportFeature): Use the abbreviated name instead of the full
symbol name.

* bzrlib/tests/__init__.py:
(_CompatabilityThunkFeature.__init__): Use clearer parameter names
to specify the feature and its replacement version. Default to the
same module for both features.
(_CompatabilityThunkFeature._ensure): Really thunk to the
replacement feature. Emits two distinct messages for easier
testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
 
22
22
apport = tests.ModuleAvailableFeature('apport')
23
 
ApportFeature = tests._CompatabilityThunkFeature('bzrlib.tests.features',
24
 
    'ApportFeature', 'bzrlib.tests.features.apport', deprecated_in((2,1,0)))
 
23
ApportFeature = tests._CompatabilityThunkFeature(
 
24
    deprecated_in((2, 2, 0)),
 
25
    'bzrlib.tests.features',
 
26
    'ApportFeature', 'apport')
25
27
paramiko = tests.ModuleAvailableFeature('paramiko')
26
28
pycurl = tests.ModuleAvailableFeature('pycurl')
27
29
subunit = tests.ModuleAvailableFeature('subunit')