summaryrefslogtreecommitdiff
path: root/tests/test_config.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-08-23 15:04:45 +0000
committerGeorg Brandl <georg@python.org>2008-08-23 15:04:45 +0000
commitf0605a40a40dbd58b929d5535a1a6e04a3ed9c82 (patch)
tree211c722ee0079311e599b3b665a778f15c84bf09 /tests/test_config.py
parent5f0c30ac90c107b69f180bb94dfa2e6bdad5003e (diff)
downloadsphinx-git-f0605a40a40dbd58b929d5535a1a6e04a3ed9c82.tar.gz
Merged revisions 65640,65675,65699,65701 via svnmerge from
svn+ssh://pythondev@svn.python.org/doctools/branches/0.4.x ........ r65640 | georg.brandl | 2008-08-11 16:11:17 +0200 (Mon, 11 Aug 2008) | 2 lines More info in intro. ........ r65675 | georg.brandl | 2008-08-14 13:53:02 +0200 (Thu, 14 Aug 2008) | 2 lines #3546: add missing linebreak. ........ r65699 | benjamin.peterson | 2008-08-15 23:02:22 +0200 (Fri, 15 Aug 2008) | 4 lines rename util.with_testapp to util.with_app; nose was running it also make an assert more informative ........ r65701 | benjamin.peterson | 2008-08-16 00:00:54 +0200 (Sat, 16 Aug 2008) | 1 line add some tests for sphinx.application ........
Diffstat (limited to 'tests/test_config.py')
-rw-r--r--tests/test_config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_config.py b/tests/test_config.py
index 4e05c77d1..3b9ea6920 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -15,7 +15,7 @@ from util import *
from sphinx.application import ExtensionError
-@with_testapp(confoverrides={'master_doc': 'master', 'nonexisting_value': 'True'})
+@with_app(confoverrides={'master_doc': 'master', 'nonexisting_value': 'True'})
def test_core_config(app):
cfg = app.config
@@ -61,7 +61,7 @@ def test_core_config(app):
assert cfg['project'] == cfg.project == 'Sphinx Tests'
-@with_testapp()
+@with_app()
def test_extension_values(app):
cfg = app.config