Remove redundant decorators and unify into decorators.py

IPython/testing/tests/test_decorators_trial.py

@@ -1,52 +1,57 b''
 # encoding: utf-8
 """
-Tests for decorators_trial.py
+Tests for decorators.py compatibility with Twisted.trial
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2009  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
-# Tell nose to skip this module
+# Tell nose to skip this module, since this is for twisted only
 __test__ = {}
 
 import os
 import sys
 
 from twisted.trial import unittest
-import IPython.testing.decorators_trial as dec
+import IPython.testing.decorators as dec
 
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------
 
+# Note: this code is identical to that in test_decorators, but that one uses
+# stdlib unittest, not the one from twisted, which we are using here. While
+# somewhat redundant, we want to check both with the stdlib and with twisted,
+# so the duplication is OK.
+
 class TestDecoratorsTrial(unittest.TestCase):
     
     @dec.skip()
     def test_deliberately_broken(self):
         """A deliberately broken test - we want to skip this one."""
         1/0
 
     @dec.skip('Testing the skip decorator')
     def test_deliberately_broken2(self):
         """Another deliberately broken test - we want to skip this one."""
         1/0
 
     @dec.skip_linux
     def test_linux(self):
         self.assertNotEquals(sys.platform,'linux2',"This test can't run under linux")
 
     @dec.skip_win32
     def test_win32(self):
         self.assertNotEquals(sys.platform,'win32',"This test can't run under windows")
 
     @dec.skip_osx
     def test_osx(self):
-        self.assertNotEquals(sys.platform,'darwin',"This test can't run under osx")
  No newline at end of file
+        self.assertNotEquals(sys.platform,'darwin',"This test can't run under osx")