summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-12-08 08:44:34 +0100
committerGeorg Brandl <georg@python.org>2008-12-08 08:44:34 +0100
commit3d8f2783f81f5b9de59e3a985e504f61c9e62df6 (patch)
tree1d636a8b90e107878499c8ab67e8f73b447dde55 /tests
parent00e089347e65b4ad42bd2bb355baff86ffb0be7e (diff)
parentd499a5288b63a11a099e93537733c78a90a352ac (diff)
downloadsphinx-3d8f2783f81f5b9de59e3a985e504f61c9e62df6.tar.gz
Automated merge with file:///home/gbr/devel/sphinx0.5
Diffstat (limited to 'tests')
-rw-r--r--tests/root/contents.txt1
-rw-r--r--tests/root/subdir/images.txt4
-rw-r--r--tests/test_build.py3
3 files changed, 8 insertions, 0 deletions
diff --git a/tests/root/contents.txt b/tests/root/contents.txt
index e8e6a564..61646f62 100644
--- a/tests/root/contents.txt
+++ b/tests/root/contents.txt
@@ -11,6 +11,7 @@ Contents:
:maxdepth: 2
images
+ subdir/images
includes
markup
desc
diff --git a/tests/root/subdir/images.txt b/tests/root/subdir/images.txt
new file mode 100644
index 00000000..33adf5b5
--- /dev/null
+++ b/tests/root/subdir/images.txt
@@ -0,0 +1,4 @@
+Image including source in subdir
+================================
+
+.. image:: img.*
diff --git a/tests/test_build.py b/tests/test_build.py
index 410a4e14..61d494d8 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -51,6 +51,9 @@ HTML_XPATH = {
".//img[@src='_images/img1.png']": '',
".//img[@src='_images/simg.png']": '',
},
+ 'subdir/images.html': {
+ ".//img[@src='../_images/img1.png']": '',
+ },
'includes.html': {
".//pre/span[@class='s']": u'üöä',
".//pre": u'Max Strauß',