testtools

Merge lp:~lifeless/testtools/discover-list into lp:~testtools-committers/testtools/trunk

  1. discover-list
  2. Merge into trunk
Proposed by Robert Collins
Status: Merged
Approved by: Jonathan Lange
Approved revision: 277
Merged at revision: 277
Proposed branch: lp:~lifeless/testtools/discover-list
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 38 lines (+7/-2)
3 files modified
.testr.conf (+1/-1)
NEWS (+5/-0)
testtools/run.py (+1/-1)
To merge this branch: bzr merge lp:~lifeless/testtools/discover-list
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+130253@code.launchpad.net

Description of the change

It was bust. Can has fix.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

All good. I don't think I mind the lack of test coverage here.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.testr.conf'
2--- .testr.conf 2010-12-06 07:25:09 +0000
3+++ .testr.conf 2012-10-17 22:50:36 +0000
4@@ -1,4 +1,4 @@
5 [DEFAULT]
6-test_command=PYTHONPATH=. python -m subunit.run $LISTOPT $IDOPTION testtools.tests.test_suite
7+test_command=python -m subunit.run discover $LISTOPT $IDOPTION .
8 test_id_option=--load-list $IDFILE
9 test_list_option=--list
10
11=== modified file 'NEWS'
12--- NEWS 2012-09-08 17:27:37 +0000
13+++ NEWS 2012-10-17 22:50:36 +0000
14@@ -12,6 +12,11 @@
15 * The ``testtools.matchers`` package has been split up. No change to the
16 public interface. (Jonathan Lange)
17
18+Improvements
19+------------
20+
21+* ``python -m testtools.run discover . --list`` now works. (Robert Collins)
22+
23
24 0.9.16
25 ~~~~~~
26
27=== modified file 'testtools/run.py'
28--- testtools/run.py 2011-07-26 23:34:12 +0000
29+++ testtools/run.py 2012-10-17 22:50:36 +0000
30@@ -269,7 +269,7 @@
31 help="Pattern to match tests ('test*.py' default)")
32 parser.add_option('-t', '--top-level-directory', dest='top', default=None,
33 help='Top level directory of project (defaults to start directory)')
34- parser.add_option('-l', '--list', dest='listtests', default=False,
35+ parser.add_option('-l', '--list', dest='listtests', default=False, action="store_true",
36 help='List tests rather than running them.')
37 parser.add_option('--load-list', dest='load_list', default=None,
38 help='Specify a filename containing the test ids to use.')

Subscribers

People subscribed via source and target branches