Merge pull request #8085 from minrk/nbconvert-tests

remove obsolete `onlyif_any_cmd_exists` on nbconvert tests

IPython/nbconvert/exporters/tests/base.py

@@ -1,54 +1,38
 """Base TestCase class for testing Exporters"""
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
 
 import os
 
-from IPython.testing.decorators import onlyif_any_cmd_exists
-
 from ...tests.base import TestsBase
 
-#-----------------------------------------------------------------------------
-# Class
-#-----------------------------------------------------------------------------
-
 all_raw_mimetypes = {
     'text/x-python',
     'text/markdown',
     'text/html',
     'text/restructuredtext',
     'text/latex',
 }
 
 class ExportersTestsBase(TestsBase):
     """Contains base test functions for exporters"""
     
     exporter_class = None
     should_include_raw = None
     
     def _get_notebook(self, nb_name='notebook2.ipynb'):
         return os.path.join(self._get_files_path(), nb_name)
     
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_raw_cell_inclusion(self):
         """test raw cell inclusion based on raw_mimetype metadata"""
         if self.should_include_raw is None:
             return
         exporter = self.exporter_class()
         (output, resources) = exporter.from_filename(self._get_notebook('rawtest.ipynb'))
         for inc in self.should_include_raw:
             self.assertIn('raw %s' % inc, output, "should include %s" % inc)
         self.assertIn('no raw_mimetype metadata', output)
         for exc in all_raw_mimetypes.difference(self.should_include_raw):
             self.assertNotIn('raw %s' % exc, output, "should exclude %s" % exc)
         self.assertNotIn('never be included', output)

IPython/nbconvert/exporters/tests/test_html.py

@@ -1,86 +1,68
 """Tests for HTMLExporter"""
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
 
 from .base import ExportersTestsBase
 from ..html import HTMLExporter
-from IPython.testing.decorators import onlyif_any_cmd_exists
 import re
 
-#-----------------------------------------------------------------------------
-# Class
-#-----------------------------------------------------------------------------
 
 class TestHTMLExporter(ExportersTestsBase):
     """Tests for HTMLExporter"""
     
     exporter_class = HTMLExporter
     should_include_raw = ['html']
 
     def test_constructor(self):
         """
         Can a HTMLExporter be constructed?
         """
         HTMLExporter()
 
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_export(self):
         """
         Can a HTMLExporter export something?
         """
         (output, resources) = HTMLExporter().from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_export_basic(self):
         """
         Can a HTMLExporter export using the 'basic' template?
         """
         (output, resources) = HTMLExporter(template_file='basic').from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_export_full(self):
         """
         Can a HTMLExporter export using the 'full' template?
         """
         (output, resources) = HTMLExporter(template_file='full').from_filename(self._get_notebook())
         assert len(output) > 0
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_prompt_number(self):
         """
         Does HTMLExporter properly format input and output prompts?
         """
         (output, resources) = HTMLExporter(template_file='full').from_filename(
             self._get_notebook(nb_name="prompt_numbers.ipynb"))
         in_regex = r"In \[(.*)\]:"
         out_regex = r"Out\[(.*)\]:"
 
         ins = ["2", "10", " ", " ", "*", "0"]
         outs = ["10"]
 
         assert re.findall(in_regex, output) == ins
         assert re.findall(out_regex, output) == outs
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_png_metadata(self):
         """
         Does HTMLExporter with the 'basic' template treat pngs with width/height metadata correctly?
         """
         (output, resources) = HTMLExporter(template_file='basic').from_filename(
             self._get_notebook(nb_name="pngmetadata.ipynb"))
         assert len(output) > 0

IPython/nbconvert/exporters/tests/test_slides.py

@@ -1,51 +1,36
 """Tests for SlidesExporter"""
 
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
+# Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
 
 from .base import ExportersTestsBase
 from ..slides import SlidesExporter
-from IPython.testing.decorators import onlyif_any_cmd_exists
 
-#-----------------------------------------------------------------------------
-# Class
-#-----------------------------------------------------------------------------
 
 class TestSlidesExporter(ExportersTestsBase):
     """Tests for SlidesExporter"""
 
     exporter_class = SlidesExporter
     should_include_raw = ['html']
 
     def test_constructor(self):
         """
         Can a SlidesExporter be constructed?
         """
         SlidesExporter()
 
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_export(self):
         """
         Can a SlidesExporter export something?
         """
         (output, resources) = SlidesExporter().from_filename(self._get_notebook())
         assert len(output) > 0
 
 
-    @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc')
     def test_export_reveal(self):
         """
         Can a SlidesExporter export using the 'reveal' template?
         """
         (output, resources) = SlidesExporter(template_file='slides_reveal').from_filename(self._get_notebook())
         assert len(output) > 0