From 1c5009c3fb3b96aa9a551bacffe51eda7043a036 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 28 Jan 2019 12:50:04 -0200
Subject: [PATCH] Handle unittest.SkipTest exception with non-ascii characters

Fix #4669
---
 changelog/4669.bugfix.rst |  1 +
 src/_pytest/nose.py       |  4 +++-
 testing/test_nose.py      | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 changelog/4669.bugfix.rst

diff --git a/changelog/4669.bugfix.rst b/changelog/4669.bugfix.rst
new file mode 100644
index 000000000..e5c18353c
--- /dev/null
+++ b/changelog/4669.bugfix.rst
@@ -0,0 +1 @@
+Correctly handle ``unittest.SkipTest`` exception containing non-ascii characters on Python 2.
diff --git a/src/_pytest/nose.py b/src/_pytest/nose.py
index 6facc547f..13dda68e7 100644
--- a/src/_pytest/nose.py
+++ b/src/_pytest/nose.py
@@ -5,6 +5,8 @@ from __future__ import print_function
 
 import sys
 
+import six
+
 from _pytest import python
 from _pytest import runner
 from _pytest import unittest
@@ -24,7 +26,7 @@ def pytest_runtest_makereport(item, call):
     if call.excinfo and call.excinfo.errisinstance(get_skip_exceptions()):
         # let's substitute the excinfo with a pytest.skip one
         call2 = runner.CallInfo.from_call(
-            lambda: runner.skip(str(call.excinfo.value)), call.when
+            lambda: runner.skip(six.text_type(call.excinfo.value)), call.when
         )
         call.excinfo = call2.excinfo
 
diff --git a/testing/test_nose.py b/testing/test_nose.py
index 3e9966529..6f3d292dd 100644
--- a/testing/test_nose.py
+++ b/testing/test_nose.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -366,3 +367,17 @@ def test_nottest_class_decorator(testdir):
     assert not reprec.getfailedcollections()
     calls = reprec.getreports("pytest_runtest_logreport")
     assert not calls
+
+
+def test_skip_test_with_unicode(testdir):
+    testdir.makepyfile(
+        """
+        # encoding: utf-8
+        import unittest
+        class TestClass():
+            def test_io(self):
+                raise unittest.SkipTest(u'😊')
+    """
+    )
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines("* 1 skipped *")