##// END OF EJS Templates
Moved skip decorator to testing and created similar ones for OSX and linux, create delete testdirs in module setup/teardown
Jorgen Stenarson -
Show More
@@ -155,6 +155,11 b" def skip(msg=''):"
155 return inner
155 return inner
156
156
157 # Decorators to skip certain tests on specific platforms.
157 # Decorators to skip certain tests on specific platforms.
158 skip_win32 = skipif(sys.platform=='win32',"This test does not run under Windows")
158 skip_win32 = skipif(sys.platform == 'win32',"This test does not run under Windows")
159 skip_linux = skipif(sys.platform=='linux2',"This test does not run under Linux")
159 skip_linux = skipif(sys.platform == 'linux2',"This test does not run under Linux")
160 skip_osx = skipif(sys.platform=='darwin',"This test does not run under OSX")
160 skip_osx = skipif(sys.platform == 'darwin',"This test does not run under OSX")
161
162 # Decorators to skip tests if not on specific platforms.
163 skip_if_not_win32 = skipif(sys.platform != 'win32', "This test only runs under Windows")
164 skip_if_not_linux = skipif(sys.platform != 'linux2', "This test only runs under Linux")
165 skip_if_not_osx = skipif(sys.platform != 'darwin', "This test only runs under OSX")
@@ -38,7 +38,20 b' except ImportError:'
38
38
39 test_file_path = split(abspath(__file__))[0]
39 test_file_path = split(abspath(__file__))[0]
40
40
41 #skip_if_not_win32 = skipif(sys.platform!='win32',"This test only runs under Windows")
41 #
42
43 def setup():
44 try:
45 os.makedirs("home_test_dir/_ipython")
46 except WindowsError:
47 pass #Or should we complain that the test directory already exists??
48
49 def teardown():
50 try:
51 os.removedirs("home_test_dir/_ipython")
52 except WindowsError:
53 pass #Or should we complain that the test directory already exists??
54
42
55
43 def setup_environment():
56 def setup_environment():
44 global oldstuff, platformstuff
57 global oldstuff, platformstuff
General Comments 0
You need to be logged in to leave comments. Login now