On Windows `Path.cwd()` might be in short filename/SFN format

IPython/extensions/tests/test_storemagic.py

@@ -1,65 +1,66 b''
 import tempfile, os
+from pathlib import Path
 
 from traitlets.config.loader import Config
 
 
 def setup_module():
     ip.magic('load_ext storemagic')
 
 def test_store_restore():
     assert 'bar' not in ip.user_ns, "Error: some other test leaked `bar` in user_ns"
     assert 'foo' not in ip.user_ns, "Error: some other test leaked `foo` in user_ns"
     assert 'foobar' not in ip.user_ns, "Error: some other test leaked `foobar` in user_ns"
     assert 'foobaz' not in ip.user_ns, "Error: some other test leaked `foobaz` in user_ns"
     ip.user_ns['foo'] = 78
     ip.magic('alias bar echo "hello"')
     ip.user_ns['foobar'] = 79
     ip.user_ns['foobaz'] = '80'
     tmpd = tempfile.mkdtemp()
     ip.magic('cd ' + tmpd)
     ip.magic('store foo')
     ip.magic('store bar')
     ip.magic('store foobar foobaz')
 
     # Check storing
     assert ip.db["autorestore/foo"] == 78
     assert "bar" in ip.db["stored_aliases"]
     assert ip.db["autorestore/foobar"] == 79
     assert ip.db["autorestore/foobaz"] == "80"
 
     # Remove those items
     ip.user_ns.pop('foo', None)
     ip.user_ns.pop('foobar', None)
     ip.user_ns.pop('foobaz', None)
     ip.alias_manager.undefine_alias('bar')
     ip.magic('cd -')
     ip.user_ns['_dh'][:] = []
 
     # Check restoring
     ip.magic("store -r foo bar foobar foobaz")
     assert ip.user_ns["foo"] == 78
     assert ip.alias_manager.is_alias("bar")
     assert ip.user_ns["foobar"] == 79
     assert ip.user_ns["foobaz"] == "80"
 
     ip.magic("store -r")  # restores _dh too
-    assert os.path.realpath(tmpd) in ip.user_ns["_dh"]
+    assert any(Path(tmpd).samefile(p) for p in ip.user_ns["_dh"])
 
     os.rmdir(tmpd)
 
 def test_autorestore():
     ip.user_ns['foo'] = 95
     ip.magic('store foo')
     del ip.user_ns['foo']
     c = Config()
     c.StoreMagics.autorestore = False
     orig_config = ip.config
     try:
         ip.config = c
         ip.extension_manager.reload_extension("storemagic")
         assert "foo" not in ip.user_ns
         c.StoreMagics.autorestore = True
         ip.extension_manager.reload_extension("storemagic")
         assert ip.user_ns["foo"] == 95
     finally:
         ip.config = orig_config

IPython/utils/tests/test_tempdir.py

@@ -1,29 +1,29 b''
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2012-  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 from pathlib import Path
 
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython.utils.tempdir import TemporaryWorkingDirectory
 
 
 def test_named_file_in_temporary_directory():
     with NamedFileInTemporaryDirectory('filename') as file:
         name = file.name
         assert not file.closed
         assert Path(name).exists()
         file.write(b'test')
     assert file.closed
     assert not Path(name).exists()
 
 def test_temporary_working_directory():
     with TemporaryWorkingDirectory() as directory:
-        directory_path = Path(directory)
+        directory_path = Path(directory).resolve()
         assert directory_path.exists()
-        assert Path.cwd() == directory_path.resolve()
+        assert Path.cwd().resolve() == directory_path
     assert not directory_path.exists()
-    assert Path.cwd() != directory_path.resolve()
+    assert Path.cwd().resolve() != directory_path