diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2011-07-14 10:56:53 -0400 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2011-07-14 10:56:53 -0400 |
| commit | f45ed99204dfadc5a81496524fae5a9b0c6e19fb (patch) | |
| tree | f162c8c3da515cd93ffdd2cb71af82f048fb27f9 /functional_tests/doc_tests | |
| parent | 52349c02ce515b999801e21a609ec0f69dd1412d (diff) | |
| parent | 35624a20de3702a31bda140bad303a9afcd30113 (diff) | |
| download | nose-f45ed99204dfadc5a81496524fae5a9b0c6e19fb.tar.gz | |
Merged in garyd/nose (pull request #3)
Diffstat (limited to 'functional_tests/doc_tests')
| -rw-r--r-- | functional_tests/doc_tests/test_issue142/errorclass_failure.rst.py3.patch | 38 | ||||
| -rw-r--r-- | functional_tests/doc_tests/test_multiprocess/multiprocess.rst | 2 |
2 files changed, 2 insertions, 38 deletions
diff --git a/functional_tests/doc_tests/test_issue142/errorclass_failure.rst.py3.patch b/functional_tests/doc_tests/test_issue142/errorclass_failure.rst.py3.patch deleted file mode 100644 index f598a64..0000000 --- a/functional_tests/doc_tests/test_issue142/errorclass_failure.rst.py3.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- errorclass_failure.rst.orig 2010-08-31 10:39:35.000000000 -0700 -+++ errorclass_failure.rst 2010-08-31 10:40:26.000000000 -0700 -@@ -30,7 +30,7 @@ - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- Todo: fix me -+ errorclass_failure_plugin.Todo: fix me - <BLANKLINE> - ---------------------------------------------------------------------- - Ran 2 tests in ...s -@@ -49,7 +49,7 @@ - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- Todo: fix me -+ errorclass_failure_plugin.Todo: fix me - <BLANKLINE> - ---------------------------------------------------------------------- - Ran 1 test in ...s -@@ -95,7 +95,7 @@ - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- Todo: fix me -+ errorclass_failure_plugin.Todo: fix me - <BLANKLINE> - ---------------------------------------------------------------------- - Ran 6 tests in ...s -@@ -114,7 +114,7 @@ - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- Todo: fix me -+ errorclass_failure_plugin.Todo: fix me - <BLANKLINE> - ---------------------------------------------------------------------- - Ran 6 tests in ...s diff --git a/functional_tests/doc_tests/test_multiprocess/multiprocess.rst b/functional_tests/doc_tests/test_multiprocess/multiprocess.rst index 1808faf..d463ba0 100644 --- a/functional_tests/doc_tests/test_multiprocess/multiprocess.rst +++ b/functional_tests/doc_tests/test_multiprocess/multiprocess.rst @@ -221,6 +221,8 @@ Then we can run again and see the failures. >>> run(argv=['nosetests', '-v', '--processes=2', test_can_split], ... plugins=[MultiProcess()]) #doctest: +ELLIPSIS + setup called + teardown called test_can_split.... ... FAILED (failures=...) |