just skip the tests that require unittest2 if it's not available

qgis · Sep 29, 2012 · 1ed231a · 1ed231a
1 parent d684f1f
commit 1ed231a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/tests/src/python/test_qgsanalysis.py b/tests/src/python/test_qgsanalysis.py
@@ -27,8 +27,8 @@
     try:
         from unittest2 import TestCase, expectedFailure
     except ImportError:
-        print "You need to install unittest2 to run the salt tests"
-        sys.exit(1)
+        print "You should install unittest2 to run the salt tests"
+        sys.exit(0)
 else:
     from unittest import TestCase, expectedFailure
 

diff --git a/tests/src/python/test_qgscomposerhtml.py b/tests/src/python/test_qgscomposerhtml.py
@@ -34,8 +34,8 @@
     try:
         from unittest2 import TestCase, expectedFailure
     except ImportError:
-        print "You need to install unittest2 to run the salt tests"
-        sys.exit(1)
+        print "You should install unittest2 to run the salt tests"
+        sys.exit(0)
 else:
     from unittest import TestCase, expectedFailure
 

diff --git a/tests/src/python/test_qgscomposition.py b/tests/src/python/test_qgscomposition.py
@@ -34,8 +34,8 @@
     try:
         from unittest2 import TestCase, expectedFailure
     except ImportError:
-        print "You need to install unittest2 to run the salt tests"
-        sys.exit(1)
+        print "You should install unittest2 to run the salt tests"
+        sys.exit(0)
 else:
     from unittest import TestCase, expectedFailure
 

diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py
@@ -13,8 +13,8 @@
     try:
         from unittest2 import TestCase, expectedFailure
     except ImportError:
-        print "You need to install unittest2 to run the salt tests"
-        sys.exit(1)
+        print "You should install unittest2 to run the salt tests"
+        sys.exit(0)
 else:
     from unittest import TestCase, expectedFailure