← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/grep/test_grep.py

  • Committer: Jelmer Vernooij
  • Date: 2012-08-02 10:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 6555.
  • Revision ID: jelmer@samba.org-20120802103821-pto2dgacjtmpzl1n
Move color feature into bzrlib.tests.features.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/grep/test_grep.py
20
20
import re
21
21
import unicodedata as ud
22
22
 
23
 
from bzrlib.plugins.grep import features
24
 
from bzrlib.plugins.grep.termcolor import color_string, FG
25
 
 
26
23
from bzrlib import tests, osutils
 
24
from bzrlib.termcolor import color_string, FG
27
25
 
28
 
from bzrlib.tests.features import UnicodeFilenameFeature
 
26
from bzrlib.tests.features import (
 
27
    ColorFeature,
 
28
    UnicodeFilenameFeature,
 
29
    )
29
30
 
30
31
# NOTE: As bzr-grep optimizes PATTERN search to -F/--fixed-string
31
32
# for patterns that are not alphanumeric+whitespace, we test grep
1988
1989
    """Tests for the --color option."""
1989
1990
 
1990
1991
    # GZ 2010-06-05: Does this really require the feature? Nothing prints.
1991
 
    _test_needs_features = [features.color_feature]
 
1992
    _test_needs_features = [ColorFeature]
1992
1993
 
1993
1994
    _rev_sep = color_string('~', fg=FG.BOLD_YELLOW)
1994
1995
    _sep = color_string(':', fg=FG.BOLD_CYAN)