##// END OF EJS Templates
Fix for skipping tests when matplotlib not available.
Thomas Kluyver -
Show More
@@ -65,8 +65,8 b' class RunnerTestCase(unittest.TestCase):'
65 self.assert_(mismatch==0,'Number of mismatched lines: %s' %
65 self.assert_(mismatch==0,'Number of mismatched lines: %s' %
66 mismatch)
66 mismatch)
67
67
68 @decorators.skipif(pylab_not_importable, "Likely a run without X.")
69 @decorators.skipif_not_matplotlib
68 @decorators.skipif_not_matplotlib
69 @decorators.skipif(pylab_not_importable, "Likely a run without X.")
70 def test_pylab_import_all_enabled(self):
70 def test_pylab_import_all_enabled(self):
71 "Verify that plot is available when pylab_import_all = True"
71 "Verify that plot is available when pylab_import_all = True"
72 source = """
72 source = """
@@ -91,8 +91,8 b' Out\\[6\\]: True'
91 runner = irunner.IPythonRunner(out=self.out)
91 runner = irunner.IPythonRunner(out=self.out)
92 self._test_runner(runner,source,output)
92 self._test_runner(runner,source,output)
93
93
94 @decorators.skipif(pylab_not_importable, "Likely a run without X.")
95 @decorators.skipif_not_matplotlib
94 @decorators.skipif_not_matplotlib
95 @decorators.skipif(pylab_not_importable, "Likely a run without X.")
96 def test_pylab_import_all_disabled(self):
96 def test_pylab_import_all_disabled(self):
97 "Verify that plot is not available when pylab_import_all = False"
97 "Verify that plot is not available when pylab_import_all = False"
98 source = """
98 source = """
General Comments 0
You need to be logged in to leave comments. Login now