From 31e46ab91f2ed7948b4b1121e0406544350838fa 2012-05-29 21:04:46
From: Fernando Perez <fperez.net@gmail.com>
Date: 2012-05-29 21:04:46
Subject: [PATCH] Merge pull request #1755 from minrk/pygmentstest

test for pygments before running qt tests, to avoid an error in the test suite itself if pygments isn't present.
---

diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 6bbde36..879f8e7 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -144,6 +144,7 @@ have['curses'] = test_for('_curses')
 have['matplotlib'] = test_for('matplotlib')
 have['pexpect'] = test_for('IPython.external.pexpect')
 have['pymongo'] = test_for('pymongo')
+have['pygments'] = test_for('pygments')
 have['wx'] = test_for('wx')
 have['wx.aui'] = test_for('wx.aui')
 have['qt'] = test_for('IPython.external.qt')
@@ -255,7 +256,7 @@ def make_exclude():
         exclusions.append(ipjoin('frontend', 'consoleapp.py'))
         exclusions.append(ipjoin('frontend', 'terminal', 'console'))
         exclusions.append(ipjoin('parallel'))
-    elif not have['qt']:
+    elif not have['qt'] or not have['pygments']:
         exclusions.append(ipjoin('frontend', 'qt'))
 
     if not have['pymongo']: