summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-04-18 20:25:25 -0400
committerJohn Szakmeister <john@szakmeister.net>2014-04-19 09:36:56 -0400
commit30d8af723c14dba9196faae397007f510eb02a76 (patch)
tree71b180f9445636fb533e54a32f861b439dd65c82
parent95cf77216e16316546fd079bc193e581c4140cf3 (diff)
downloadnose-30d8af723c14dba9196faae397007f510eb02a76.tar.gz
Skip coverage tests correctly in Python 2.5 when coverage not available.
-rw-r--r--functional_tests/test_coverage_plugin.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/functional_tests/test_coverage_plugin.py b/functional_tests/test_coverage_plugin.py
index b4069bf..23dd8c3 100644
--- a/functional_tests/test_coverage_plugin.py
+++ b/functional_tests/test_coverage_plugin.py
@@ -4,6 +4,7 @@ import sys
import unittest
import shutil
+from nose.exc import SkipTest
from nose.plugins import PluginTester
from nose.plugins.cover import Coverage
@@ -28,7 +29,7 @@ class TestCoveragePlugin(PluginTester, unittest.TestCase):
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')
@@ -56,7 +57,7 @@ class TestCoverageMinPercentagePlugin(PluginTester, unittest.TestCase):
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')
@@ -81,7 +82,7 @@ class TestCoverageMinPercentageSinglePackagePlugin(
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')
@@ -107,7 +108,7 @@ class TestCoverageMinPercentageSinglePackageWithBranchesPlugin(
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')
@@ -133,7 +134,7 @@ class TestCoverageMinPercentageTOTALPlugin(PluginTester, unittest.TestCase):
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')
@@ -158,7 +159,7 @@ class TestCoverageMinPercentageWithBranchesTOTALPlugin(
def setUp(self):
if not hasCoverage:
- raise unittest.SkipTest('coverage not available; skipping')
+ raise SkipTest('coverage not available; skipping')
self.cover_file = os.path.join(os.getcwd(), '.coverage')
self.cover_html_dir = os.path.join(os.getcwd(), 'cover')