diff options
| author | Georg Brandl <georg@python.org> | 2008-12-08 08:57:46 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-12-08 08:57:46 +0100 |
| commit | aca0dce5260e948080519085e3cff1f7cdbdc15d (patch) | |
| tree | b3dc855abc1ed1d45b7734730bc8df3c95d84d86 /tests | |
| parent | 3d8f2783f81f5b9de59e3a985e504f61c9e62df6 (diff) | |
| parent | b6fd1d2188bf4c0425c59e2df6ff4898cc877402 (diff) | |
| download | sphinx-aca0dce5260e948080519085e3cff1f7cdbdc15d.tar.gz | |
Merge bugfix from 0.5.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/root/images.txt | 2 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/root/images.txt b/tests/root/images.txt index d7337542..be868dfe 100644 --- a/tests/root/images.txt +++ b/tests/root/images.txt @@ -9,6 +9,8 @@ Sphinx image handling .. an image with path name (relative to this directory!) .. image:: subdir/img.png + :height: 100 + :width: 200 .. an image with unspecified extension .. image:: img.* diff --git a/tests/test_build.py b/tests/test_build.py index 61d494d8..ea83e2e7 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -28,7 +28,7 @@ latex_warnfile = StringIO() ENV_WARNINGS = """\ WARNING: %(root)s/images.txt:9: Image file not readable: foo.png -WARNING: %(root)s/images.txt:21: Nonlocal image URI found: http://www.python.org/logo.png +WARNING: %(root)s/images.txt:23: Nonlocal image URI found: http://www.python.org/logo.png WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included \ file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option """ |