nose: support skipped tests

JetBrains · Oct 5, 2014 · 034371a · 034371a
1 parent 3797e3c
commit 034371a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/.idea/runConfigurations/Integration_Nose.xml b/.idea/runConfigurations/Integration_Nose.xml
diff --git a/teamcity/nose_report.py b/teamcity/nose_report.py
@@ -1,19 +1,20 @@
 # coding=utf-8
 import os
 import inspect
-import sys
 
 from teamcity import is_running_under_teamcity
 from teamcity.unittestpy import TeamcityTestResult
 
 
 class TeamcityReport(TeamcityTestResult):
     name = 'teamcity-report'
-    score = 2
+    score = 10000
 
     def __init__(self):
         super(TeamcityReport, self).__init__()
 
+        self.enabled = False
+
     def configure(self, options, conf):
         self.enabled = is_running_under_teamcity()
 

diff --git a/teamcity/unittestpy.py b/teamcity/unittestpy.py
@@ -67,10 +67,10 @@ def addExpectedFailure(self, test, err):
 
         self.messages.testIgnored(self.test_name, message="Expected failure: " + err)
 
-    def addSkip(self, test, reason, *k):
+    def addSkip(self, test, reason="", *k):
         TestResult.addSkip(self, test, reason)
 
-        self.messages.testIgnored(self.test_name, message="Skipped: " + reason)
+        self.messages.testIgnored(self.test_name, message="Skipped" + ((": " + reason) if reason else ""))
 
     def addUnexpectedSuccess(self, test):
         TestResult.addUnexpectedSuccess(self, test)

diff --git a/tests/guinea-pigs/nose/skiptest/testa.py b/tests/guinea-pigs/nose/skiptest/testa.py
@@ -0,0 +1,4 @@
+from nose.plugins.skip import SkipTest
+
+def test_func():
+    raise SkipTest('my skip')
diff --git a/tests/integration-tests/nose_integration_test.py b/tests/integration-tests/nose_integration_test.py
@@ -62,6 +62,21 @@ def test_docstrings(venv):
         ])
 
 
+def test_skip(venv):
+    # Note: skip reason is unavailable, see https://groups.google.com/forum/#!topic/nose-users/MnPwgZG8UbQ
+
+    output = run(venv, 'skiptest')
+    assert_service_messages(
+        output,
+        [
+            ServiceMessage('testSuiteStarted', {'name': 'testa'}),
+            ServiceMessage('testStarted', {'name': 'test_func'}),
+            ServiceMessage('testIgnored', {'name': 'test_func', 'message': 'Skipped'}),
+            ServiceMessage('testFinished', {'name': 'test_func'}),
+            ServiceMessage('testSuiteFinished', {'name': 'testa'}),
+        ])
+
+
 def test_pass(venv):
     output = run(venv, 'nose-guinea-pig.py', 'GuineaPig', 'test_pass')
     assert_service_messages(