Correct expected output file name in test.

hamogu · hamogu · commit 209b3416d18d · 2015-07-19T16:44:30.000-04:00
diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py
@@ -84,8 +84,7 @@ def plot_file(num):
             html_contents = fobj.read()
         assert_true('# Only a comment' in html_contents)
         # check plot defined in external file.
-        assert_true(file_same(range_4, plot_file(15)))
-        assert_true(file_same(range_6, plot_file(16)))
-        assert_true(file_same(range_4, plot_file(17)))
+        assert_true(file_same(range_4, pjoin(self.html_dir, 'range4.png'))
+        assert_true(file_same(range_6, pjoin(self.html_dir, 'range6.png'))
         # check if figure caption made it into html file
-        assert_true('This is the caption for plot 17.')
+        assert_true('This is the caption for plot 15.')
diff --git a/lib/matplotlib/sphinxext/tests/tinypages/range6.py b/lib/matplotlib/sphinxext/tests/tinypages/range6.py
@@ -0,0 +1,10 @@
+from matplotlib import pyplot as plt
+
+def range4():
+    '''This function should never be called if the plot_diective works as expected.'''
+    raise NotImplementedError
+
+def range6():
+    plt.figure()
+    plt.plot(range(6))
+    plt.show()
diff --git a/lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst b/lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst
@@ -115,16 +115,15 @@ Plot 14 uses ``include-source``:
 
     # Only a comment
 
-Plot 15 uses an external file with the plot commands:
+Plot 15 uses an external file with the plot commands and a caption:
 
 .. plot:: range4.py
 
+   This is the caption for plot 15.
+
+
 Plot 16 uses a specific function in a file with plot commands:
 
-.. plot:: range4.py range6
-	  
-Plot 17 uses an external file and a caption:
+.. plot:: range6.py range6
 
-.. plot:: range4.py
 
-   This is the caption for plot 17.
