summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2013-04-13 19:26:10 +0300
committerPauli Virtanen <pav@iki.fi>2013-04-13 19:27:22 +0300
commit9d849ede86cdb156a124722ce14abf1e985e6d0b (patch)
tree8e2483be85050e4cbc7853964392e437e2395764
parent688bc60658b391524c6b641e0a5e5ecd73322d02 (diff)
downloadnumpy-9d849ede86cdb156a124722ce14abf1e985e6d0b.tar.gz
ENH: testing: remove an annoying line feed from skipif decorator
The line feed is annoying as it makes Nose's verbose test output not print one line per one test.
-rw-r--r--numpy/testing/decorators.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py
index ac3526ea7..b0ddb1880 100644
--- a/numpy/testing/decorators.py
+++ b/numpy/testing/decorators.py
@@ -135,9 +135,9 @@ def skipif(skip_condition, msg=None):
if msg is None:
out = 'Test skipped due to test condition'
else:
- out = '\n'+msg
+ out = msg
- return "Skipping test: %s%s" % (func.__name__,out)
+ return "Skipping test: %s: %s" % (func.__name__, out)
# We need to define *two* skippers because Python doesn't allow both
# return with value and yield inside the same function.