Skip to content

Commit

Permalink
Fix for skipping tests when matplotlib not available.
Browse files Browse the repository at this point in the history
  • Loading branch information
takluyver committed Jan 19, 2012
1 parent f2084ed commit 2a7b50f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions IPython/lib/tests/test_irunner_pylab_magic.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ def _test_runner(self,runner,source,output):
self.assert_(mismatch==0,'Number of mismatched lines: %s' %
mismatch)

@decorators.skipif(pylab_not_importable, "Likely a run without X.")
@decorators.skipif_not_matplotlib
@decorators.skipif(pylab_not_importable, "Likely a run without X.")
def test_pylab_import_all_enabled(self):
"Verify that plot is available when pylab_import_all = True"
source = """
Expand All @@ -91,8 +91,8 @@ def test_pylab_import_all_enabled(self):
runner = irunner.IPythonRunner(out=self.out)
self._test_runner(runner,source,output)

@decorators.skipif(pylab_not_importable, "Likely a run without X.")
@decorators.skipif_not_matplotlib
@decorators.skipif(pylab_not_importable, "Likely a run without X.")
def test_pylab_import_all_disabled(self):
"Verify that plot is not available when pylab_import_all = False"
source = """
Expand Down

0 comments on commit 2a7b50f

Please sign in to comment.