Breezy

Merge lp:~jelmer/brz/no-python3-grep-yet into lp:brz

  1. no-python3-grep-yet
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/no-python3-grep-yet
Merge into: lp:brz
Diff against target: 57 lines (+0/-21)
3 files modified
breezy/plugins/grep/test_grep.py (+0/-4)
breezy/tests/features.py (+0/-12)
python3.passing (+0/-5)
To merge this branch: bzr merge lp:~jelmer/brz/no-python3-grep-yet
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+348793@code.launchpad.net

Description of the change

Remove grep tests from python3.passing.

These don't work on Python3 yet, but were skipped when we were running tests with output piped to e.g. subunit2pyunit.

Unconditionally run the color tests, even if there is no terminal. The tests don't need the terminal anyway.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

A gz from 2010 might be happier now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/grep/test_grep.py'
2--- breezy/plugins/grep/test_grep.py 2018-06-27 21:56:53 +0000
3+++ breezy/plugins/grep/test_grep.py 2018-07-01 00:11:27 +0000
4@@ -24,7 +24,6 @@
5 from ..._termcolor import color_string, FG
6
7 from ...tests.features import (
8- ColorFeature,
9 UnicodeFilenameFeature,
10 )
11
12@@ -1962,9 +1961,6 @@
13 class TestColorGrep(GrepTestBase):
14 """Tests for the --color option."""
15
16- # GZ 2010-06-05: Does this really require the feature? Nothing prints.
17- _test_needs_features = [ColorFeature]
18-
19 _rev_sep = color_string('~', fg=FG.BOLD_YELLOW)
20 _sep = color_string(':', fg=FG.BOLD_CYAN)
21
22
23=== modified file 'breezy/tests/features.py'
24--- breezy/tests/features.py 2018-01-14 05:14:06 +0000
25+++ breezy/tests/features.py 2018-07-01 00:11:27 +0000
26@@ -554,15 +554,3 @@
27
28
29 BackslashFilenameFeature = _BackslashFilenameFeature()
30-
31-
32-class _ColorFeature(Feature):
33-
34- def _probe(self):
35- from breezy._termcolor import allow_color
36- return allow_color()
37-
38- def feature_name(self):
39- return "Terminal supports color."
40-
41-ColorFeature = _ColorFeature()
42
43=== modified file 'python3.passing'
44--- python3.passing 2018-07-01 00:07:00 +0000
45+++ python3.passing 2018-07-01 00:11:27 +0000
46@@ -161,11 +161,6 @@
47 breezy.plugins.git.tests.test_urls.TestConvertURL.test_simple
48 breezy.plugins.git.tests.test_workingtree.GitWorkingTreeTests.test_conflict_list
49 breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_empty
50-breezy.plugins.grep.test_grep.TestColorGrep.test_color_option
51-breezy.plugins.grep.test_grep.TestColorGrep.test_ver_basic_file
52-breezy.plugins.grep.test_grep.TestColorGrep.test_ver_matching_files
53-breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_basic_file
54-breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_matching_files
55 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_ssh_keys
56 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_user
57 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_valid_user

Subscribers

People subscribed via source and target branches