From f90b2f845c7214a3243f438936a33152f0a29c3d Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Thu, 18 Jun 2015 22:26:35 -0300
Subject: [PATCH] unittest.SkipTest now reports original function location

Fix #748
---
 CHANGELOG                |  3 +++
 _pytest/unittest.py      |  3 +++
 testing/test_unittest.py | 13 +++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2a3595dd8..052454d2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,9 @@
 - fix issue114: skipif marker reports to internal skipping plugin;
   Thanks Floris Bruynooghe for reporting and Bruno Oliveira for the PR.
 
+- fix issue748: unittest.SkipTest reports to internal pytest unittest plugin.
+  Thanks Thomas De Schampheleire for reporting and Bruno Oliveira for the PR.
+
 2.7.1 (compared to 2.7.0)
 -----------------------------
 
diff --git a/_pytest/unittest.py b/_pytest/unittest.py
index c035bdd1a..0666fba87 100644
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -9,6 +9,7 @@ import py
 
 # for transfering markers
 from _pytest.python import transfer_markers
+from _pytest.skipping import MarkEvaluator
 
 
 def pytest_pycollect_makeitem(collector, name, obj):
@@ -113,6 +114,8 @@ class TestCaseFunction(pytest.Function):
         try:
             pytest.skip(reason)
         except pytest.skip.Exception:
+            self._evalskip = MarkEvaluator(self, 'SkipTest')
+            self._evalskip.result = True
             self._addexcinfo(sys.exc_info())
 
     def addExpectedFailure(self, testcase, rawexcinfo, reason=""):
diff --git a/testing/test_unittest.py b/testing/test_unittest.py
index 9c342976b..1ab016a5a 100644
--- a/testing/test_unittest.py
+++ b/testing/test_unittest.py
@@ -700,4 +700,17 @@ def test_issue333_result_clearing(testdir):
     reprec = testdir.inline_run()
     reprec.assertoutcome(failed=1)
 
+@pytest.mark.skipif("sys.version_info < (2,7)")
+def test_unittest_raise_skip_issue748(testdir):
+    testdir.makepyfile(test_foo="""
+        import unittest
 
+        class MyTestCase(unittest.TestCase):
+            def test_one(self):
+                raise unittest.SkipTest('skipping due to reasons')
+    """)
+    result = testdir.runpytest("-v", '-rs')
+    result.stdout.fnmatch_lines("""
+        *SKIP*[1]*test_foo.py*skipping due to reasons*
+        *1 skipped*
+    """)