← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-23 09:00:18 UTC
  • mfrom: (5439.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100923090018-01aj4ifyzaps50bo
(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
28
28
pycurl = tests.ModuleAvailableFeature('pycurl')
29
29
pywintypes = tests.ModuleAvailableFeature('pywintypes')
30
30
subunit = tests.ModuleAvailableFeature('subunit')
 
31
sphinx = tests.ModuleAvailableFeature('sphinx')
31
32
 
32
33
 
33
34
class _BackslashDirSeparatorFeature(tests.Feature):
113
114
 
114
115
bash_feature = ExecutableFeature('bash')
115
116
sed_feature = ExecutableFeature('sed')
 
117
diff_feature = ExecutableFeature('diff')