summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@gmail.com>2014-03-14 12:44:03 +0400
committerDmitry Shachnev <mitya57@gmail.com>2014-03-18 12:05:43 +0400
commit5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa (patch)
treefdb8e181c63ca9f2db450a42b5ce885388411b2c
parent4a610dadb26c3c2f5ca7946fe5645faf5d9f070f (diff)
downloadnose-5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa.tar.gz
Fix #782: Make doctest work with new configparser versions
Upstream changeset http://hg.python.org/cpython/rev/791674a74e47 switched format from %s to %r, so we need to add some ellipses to work with both old and new versions.
-rw-r--r--unit_tests/test_config_defaults.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/unit_tests/test_config_defaults.rst b/unit_tests/test_config_defaults.rst
index 944d370..034f58e 100644
--- a/unit_tests/test_config_defaults.rst
+++ b/unit_tests/test_config_defaults.rst
@@ -89,9 +89,9 @@ Invalid config files
(file-like object)
- >>> options, args = parse([], StringIO("spam"))
+ >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS
error: Error reading config file '<???>': File contains no section headers.
- file: <???>, line: 1
+ file: ...<???>..., line: 1
'spam'
(filename)
@@ -99,7 +99,7 @@ Invalid config files
>>> options, args = parse([], os.path.join(support, "invalid.cfg"))
... # doctest: +ELLIPSIS
error: Error reading config file '...invalid.cfg': File contains no section headers.
- file: ...invalid.cfg, line: 1
+ file: ...invalid.cfg..., line: 1
'spam\n'
(filenames, length == 1)
@@ -107,7 +107,7 @@ Invalid config files
>>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
... # doctest: +ELLIPSIS
error: Error reading config file '...invalid.cfg': File contains no section headers.
- file: ...invalid.cfg, line: 1
+ file: ...invalid.cfg..., line: 1
'spam\n'
(filenames, length > 1)
@@ -120,7 +120,7 @@ file is bad
... os.path.join(support, "b.cfg")])
... # doctest: +ELLIPSIS
error: Error reading config file '...invalid.cfg': File contains no section headers.
- file: ...invalid.cfg, line: 1
+ file: ...invalid.cfg..., line: 1
'spam\n'