From 9a5f57ab741ebcc6e6d1a77120e89878822e70cc 2013-02-21 17:57:09
From: MinRK <benjaminrk@gmail.com>
Date: 2013-02-21 17:57:09
Subject: [PATCH] fix count when testing composite error output
---

diff --git a/IPython/parallel/tests/test_view.py b/IPython/parallel/tests/test_view.py
index f0c1b12..c15f426 100644
--- a/IPython/parallel/tests/test_view.py
+++ b/IPython/parallel/tests/test_view.py
@@ -615,12 +615,15 @@ class TestView(ClusterTestCase, ParametricTestCase):
         ar = view.execute("1/0")
         ip = get_ipython()
         ip.user_ns['ar'] = ar
+
         with capture_output() as io:
             ip.run_cell("ar.get(2)")
         
-        self.assertEqual(io.stdout.count('ZeroDivisionError'), len(view) * 2, io.stdout)
-        self.assertEqual(io.stdout.count('by zero'), len(view), io.stdout)
-        self.assertEqual(io.stdout.count(':execute'), len(view), io.stdout)
+        count = min(error.CompositeError.tb_limit, len(view))
+        
+        self.assertEqual(io.stdout.count('ZeroDivisionError'), count * 2, io.stdout)
+        self.assertEqual(io.stdout.count('by zero'), count, io.stdout)
+        self.assertEqual(io.stdout.count(':execute'), count, io.stdout)
     
     def test_compositeerror_truncate(self):
         """Truncate CompositeErrors with many exceptions"""