Skip to content

Commit 1ed231a

Browse files
committedSep 29, 2012
just skip the tests that require unittest2 if it's not available
1 parent d684f1f commit 1ed231a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed
 

‎tests/src/python/test_qgsanalysis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
try:
2828
from unittest2 import TestCase, expectedFailure
2929
except ImportError:
30-
print "You need to install unittest2 to run the salt tests"
31-
sys.exit(1)
30+
print "You should install unittest2 to run the salt tests"
31+
sys.exit(0)
3232
else:
3333
from unittest import TestCase, expectedFailure
3434

‎tests/src/python/test_qgscomposerhtml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
try:
3535
from unittest2 import TestCase, expectedFailure
3636
except ImportError:
37-
print "You need to install unittest2 to run the salt tests"
38-
sys.exit(1)
37+
print "You should install unittest2 to run the salt tests"
38+
sys.exit(0)
3939
else:
4040
from unittest import TestCase, expectedFailure
4141

‎tests/src/python/test_qgscomposition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
try:
3535
from unittest2 import TestCase, expectedFailure
3636
except ImportError:
37-
print "You need to install unittest2 to run the salt tests"
38-
sys.exit(1)
37+
print "You should install unittest2 to run the salt tests"
38+
sys.exit(0)
3939
else:
4040
from unittest import TestCase, expectedFailure
4141

‎tests/src/python/test_qgsrectangle.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
try:
1414
from unittest2 import TestCase, expectedFailure
1515
except ImportError:
16-
print "You need to install unittest2 to run the salt tests"
17-
sys.exit(1)
16+
print "You should install unittest2 to run the salt tests"
17+
sys.exit(0)
1818
else:
1919
from unittest import TestCase, expectedFailure
2020

0 commit comments

Comments
 (0)
Please sign in to comment.