Merge branch '2.4.5' of ssh://git.tasktools.org/tm/task into 2.4.5

This commit is contained in:
Paul Beckingham 2015-07-11 07:23:27 -04:00
commit 58d6d8be14
2 changed files with 3 additions and 3 deletions

View file

@ -185,7 +185,7 @@ class Task(object):
If you wish to pass instructions to task such as confirmations or other
input via stdin, you can do so by providing a input string.
Such as input="y\ny".
Such as input="y\ny\n".
If merge_streams=True stdout and stderr will be merged into stdout.
@ -219,7 +219,7 @@ class Task(object):
If you wish to pass instructions to task such as confirmations or other
input via stdin, you can do so by providing a input string.
Such as input="y\ny".
Such as input="y\ny\n".
If merge_streams=True stdout and stderr will be merged into stdout.

View file

@ -221,7 +221,7 @@ class TestBug605(TestCase):
"""
self.t("add One project:p1")
code, out, err = self.t(("1", "delete"), input="y")
code, out, err = self.t(("1", "delete"), input="y\n")
self.assertIn("is 0% complete", err)
self.t("add Two project:p1")