From 929501b103ca9c4b70a68f2713f5067a383f7ce3 2008-08-14 12:50:59
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-14 12:50:59
Subject: [PATCH] Rename two tests that had identical names to distinguish them.

One of these (testExecuteFailuresEngineService_0) fails often, though
not always.  I spent hours trying to debug what's going on but failed,
and it's non-deterministic.

---

diff --git a/IPython/kernel/tests/engineservicetest.py b/IPython/kernel/tests/engineservicetest.py
index 7336acd..afd28b4 100644
--- a/IPython/kernel/tests/engineservicetest.py
+++ b/IPython/kernel/tests/engineservicetest.py
@@ -128,8 +128,9 @@ class IEngineCoreTestCase(object):
         return d
     
     @parametric
-    def testExecuteFailures(cls):
-        return [(cls.runTestExecuteFailures, cmd, exc) for cmd, exc in invalidCommands]
+    def testExecuteFailuresEngineService(cls):
+        return [(cls.runTestExecuteFailures, cmd, exc)
+                for cmd, exc in invalidCommands]
     
     def runTestPushPull(self, o):
         d = self.engine.push(dict(a=o))
diff --git a/IPython/kernel/tests/multienginetest.py b/IPython/kernel/tests/multienginetest.py
index 10b690e..914c4a8 100644
--- a/IPython/kernel/tests/multienginetest.py
+++ b/IPython/kernel/tests/multienginetest.py
@@ -187,7 +187,7 @@ class IMultiEngineTestCase(IMultiEngineBaseTestCase):
         return d
 
     @parametric
-    def testExecuteFailures(cls):
+    def testExecuteFailuresMultiEng(cls):
         return [(cls.runExecuteFailures,cmd,exc) for
                 cmd,exc in invalidCommands]