Show More
@@ -1,6 +1,6 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Tests for decorators_trial.py |
|
3 | Tests for decorators.py compatibility with Twisted.trial | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | #----------------------------------------------------------------------------- |
|
6 | #----------------------------------------------------------------------------- | |
@@ -14,19 +14,24 b' Tests for decorators_trial.py' | |||||
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 |
|
16 | |||
17 | # Tell nose to skip this module |
|
17 | # Tell nose to skip this module, since this is for twisted only | |
18 | __test__ = {} |
|
18 | __test__ = {} | |
19 |
|
19 | |||
20 | import os |
|
20 | import os | |
21 | import sys |
|
21 | import sys | |
22 |
|
22 | |||
23 | from twisted.trial import unittest |
|
23 | from twisted.trial import unittest | |
24 |
import IPython.testing.decorators |
|
24 | import IPython.testing.decorators as dec | |
25 |
|
25 | |||
26 | #----------------------------------------------------------------------------- |
|
26 | #----------------------------------------------------------------------------- | |
27 | # Tests |
|
27 | # Tests | |
28 | #----------------------------------------------------------------------------- |
|
28 | #----------------------------------------------------------------------------- | |
29 |
|
29 | |||
|
30 | # Note: this code is identical to that in test_decorators, but that one uses | |||
|
31 | # stdlib unittest, not the one from twisted, which we are using here. While | |||
|
32 | # somewhat redundant, we want to check both with the stdlib and with twisted, | |||
|
33 | # so the duplication is OK. | |||
|
34 | ||||
30 | class TestDecoratorsTrial(unittest.TestCase): |
|
35 | class TestDecoratorsTrial(unittest.TestCase): | |
31 |
|
36 | |||
32 | @dec.skip() |
|
37 | @dec.skip() | |
@@ -49,4 +54,4 b' class TestDecoratorsTrial(unittest.TestCase):' | |||||
49 |
|
54 | |||
50 | @dec.skip_osx |
|
55 | @dec.skip_osx | |
51 | def test_osx(self): |
|
56 | def test_osx(self): | |
52 | self.assertNotEquals(sys.platform,'darwin',"This test can't run under osx") No newline at end of file |
|
57 | self.assertNotEquals(sys.platform,'darwin',"This test can't run under osx") |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now