← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

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')
32
31
 
33
32
 
34
33
class _BackslashDirSeparatorFeature(tests.Feature):
114
113
 
115
114
bash_feature = ExecutableFeature('bash')
116
115
sed_feature = ExecutableFeature('sed')
117
 
diff_feature = ExecutableFeature('diff')