diff --git a/IPython/nbconvert/preprocessors/tests/base.py b/IPython/nbconvert/preprocessors/tests/base.py index d5c1459..81fe492 100644 --- a/IPython/nbconvert/preprocessors/tests/base.py +++ b/IPython/nbconvert/preprocessors/tests/base.py @@ -36,11 +36,14 @@ class PreprocessorTestsBase(TestsBase): nbformat.new_output(output_type="stream", stream="stdout", output_text="d"), nbformat.new_output(output_type="stream", stream="stderr", output_text="e"), nbformat.new_output(output_type="stream", stream="stderr", output_text="f"), - nbformat.new_output(output_type="png", output_png='Zw==')] #g + nbformat.new_output(output_type="png", output_png='Zw==')] # g + out = nbformat.new_output(output_type="application/pdf") + out['application/pdf'] = 'aA==' # h + outputs.append(out) cells=[nbformat.new_code_cell(input="$ e $", prompt_number=1,outputs=outputs), nbformat.new_text_cell('markdown', source="$ e $")] - worksheets = [nbformat.new_worksheet(name="worksheet1", cells=cells)] + worksheets = [nbformat.new_worksheet(cells=cells)] return nbformat.new_notebook(name="notebook1", worksheets=worksheets) diff --git a/IPython/nbconvert/preprocessors/tests/test_extractoutput.py b/IPython/nbconvert/preprocessors/tests/test_extractoutput.py index 7c22fe5..4b2c515 100644 --- a/IPython/nbconvert/preprocessors/tests/test_extractoutput.py +++ b/IPython/nbconvert/preprocessors/tests/test_extractoutput.py @@ -29,7 +29,7 @@ class TestExtractOutput(PreprocessorTestsBase): def build_preprocessor(self): """Make an instance of a preprocessor""" preprocessor = ExtractOutputPreprocessor() - preprocessor.extract_output_types = {'text', 'png'} + preprocessor.extract_output_types = {'text', 'png', 'application/pdf'} preprocessor.enabled = True return preprocessor @@ -55,6 +55,11 @@ class TestExtractOutput(PreprocessorTestsBase): output = nb.worksheets[0].cells[0].outputs[6] assert 'png_filename' in output png_filename = output['png_filename'] + + # Check that pdf was extracted + output = nb.worksheets[0].cells[0].outputs[7] + assert 'application/pdf_filename' in output + pdf_filename = output['application/pdf_filename'] # Verify text output assert text_filename in res['outputs'] @@ -63,3 +68,7 @@ class TestExtractOutput(PreprocessorTestsBase): # Verify png output assert png_filename in res['outputs'] self.assertEqual(res['outputs'][png_filename], b'g') + + # Verify pdf output + assert pdf_filename in res['outputs'] + self.assertEqual(res['outputs'][pdf_filename], b'h')