From 53375cf194cdeee752ed94f1296af459ca2b46c6 2019-06-19 00:41:37
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2019-06-19 00:41:37
Subject: [PATCH] Use proper xunit format for some test.

In particular we now can use proper methods to check that some warnings
are raised instead of making sure the test is printed. As pytest
captures warning by default this add compatibility with pytest.

---

diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py
index 104f492..e6af8c2 100644
--- a/IPython/utils/tests/test_io.py
+++ b/IPython/utils/tests/test_io.py
@@ -66,28 +66,29 @@ def test_io_init():
         # just test for string equality.
         assert 'IPython.utils.io.IOStream' in classname, classname
 
-def test_IOStream_init():
-    """IOStream initializes from a file-like object missing attributes. """
-    # Cause a failure from getattr and dir(). (Issue #6386)
-    class BadStringIO(StringIO):
-        def __dir__(self):
-            attrs = super(StringIO, self).__dir__()
-            attrs.append('name')
-            return attrs
-
-    iostream = IOStream(BadStringIO())
-    iostream.write('hi, bad iostream\n')
-    assert not hasattr(iostream, 'name')
-    iostream.close()
-
-def test_capture_output():
-    """capture_output() context works"""
-    
-    with capture_output() as io:
-        print('hi, stdout')
-        print('hi, stderr', file=sys.stderr)
-    
-    nt.assert_equal(io.stdout, 'hi, stdout\n')
-    nt.assert_equal(io.stderr, 'hi, stderr\n')
-
-
+class TestIOStream(unittest.TestCase):
+
+    def test_IOStream_init(self):
+        """IOStream initializes from a file-like object missing attributes. """
+        # Cause a failure from getattr and dir(). (Issue #6386)
+        class BadStringIO(StringIO):
+            def __dir__(self):
+                attrs = super().__dir__()
+                attrs.append('name')
+                return attrs
+        with self.assertWarns(DeprecationWarning):
+            iostream = IOStream(BadStringIO())
+            iostream.write('hi, bad iostream\n')
+
+        assert not hasattr(iostream, 'name')
+        iostream.close()
+
+    def test_capture_output(self):
+        """capture_output() context works"""
+        
+        with capture_output() as io:
+            print('hi, stdout')
+            print('hi, stderr', file=sys.stderr)
+        
+        nt.assert_equal(io.stdout, 'hi, stdout\n')
+        nt.assert_equal(io.stderr, 'hi, stderr\n')
diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py
index 7ca2be2..a4c1fc8 100644
--- a/IPython/utils/tests/test_path.py
+++ b/IPython/utils/tests/test_path.py
@@ -263,28 +263,31 @@ def test_get_long_path_name():
     p = path.get_long_path_name('/usr/local')
     nt.assert_equal(p,'/usr/local')
 
-@dec.skip_win32 # can't create not-user-writable dir on win
-@with_environment
-def test_not_writable_ipdir():
-    tmpdir = tempfile.mkdtemp()
-    os.name = "posix"
-    env.pop('IPYTHON_DIR', None)
-    env.pop('IPYTHONDIR', None)
-    env.pop('XDG_CONFIG_HOME', None)
-    env['HOME'] = tmpdir
-    ipdir = os.path.join(tmpdir, '.ipython')
-    os.mkdir(ipdir, 0o555)
-    try:
-        open(os.path.join(ipdir, "_foo_"), 'w').close()
-    except IOError:
-        pass
-    else:
-        # I can still write to an unwritable dir,
-        # assume I'm root and skip the test
-        raise SkipTest("I can't create directories that I can't write to")
-    with AssertPrints('is not a writable location', channel='stderr'):
-        ipdir = paths.get_ipython_dir()
-    env.pop('IPYTHON_DIR', None)
+
+class TestRaiseDeprecation(unittest.TestCase):
+
+    @dec.skip_win32 # can't create not-user-writable dir on win
+    @with_environment
+    def test_not_writable_ipdir(self):
+        tmpdir = tempfile.mkdtemp()
+        os.name = "posix"
+        env.pop('IPYTHON_DIR', None)
+        env.pop('IPYTHONDIR', None)
+        env.pop('XDG_CONFIG_HOME', None)
+        env['HOME'] = tmpdir
+        ipdir = os.path.join(tmpdir, '.ipython')
+        os.mkdir(ipdir, 0o555)
+        try:
+            open(os.path.join(ipdir, "_foo_"), 'w').close()
+        except IOError:
+            pass
+        else:
+            # I can still write to an unwritable dir,
+            # assume I'm root and skip the test
+            raise SkipTest("I can't create directories that I can't write to")
+        with self.assertWarnsRegex(UserWarning, 'is not a writable location'):
+            ipdir = paths.get_ipython_dir()
+        env.pop('IPYTHON_DIR', None)
 
 @with_environment
 def test_get_py_filename():
@@ -313,7 +316,7 @@ def test_unicode_in_filename():
     """
     try:
         # these calls should not throw unicode encode exceptions
-        path.get_py_filename('fooéè.py', force_win32=False)
+        path.get_py_filename('fooéè.py')
     except IOError as ex:
         str(ex)
 
@@ -406,7 +409,7 @@ def test_ensure_dir_exists():
         with nt.assert_raises(IOError):
             path.ensure_dir_exists(f)
 
-class TestLinkOrCopy(object):
+class TestLinkOrCopy(unittest.TestCase):
     def setUp(self):
         self.tempdir = TemporaryDirectory()
         self.src = self.dst("src")