Skip to content

Add nt._path_splitroot and update ntpath #4077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Aug 16, 2022
Merged

Add nt._path_splitroot and update ntpath #4077

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b39c035
nt._path_splitroot
youknowone Aug 15, 2022
fcc473d
Update ntpath from CPython 3.10.6
youknowone Aug 15, 2022
2154d12
adjust test_ntpath markers
youknowone Aug 15, 2022
3d4fe93
Update fnmatch from CPython 3.10
Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust test_ntpath markers
  • Loading branch information
@youknowone
youknowone committed Aug 16, 2022
commit 2154d12d96330b1c71a1f5aed13f83bf97b17e27
5 changes: 5 additions & 0 deletions Lib/test/test_fnmatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ def test_bytes(self):
self.check_match(b'test\xff', b'te*\xff')
self.check_match(b'foo\nbar', b'foo*')

# TODO: RUSTPYTHON
import sys
if sys.platform == 'win32':
test_bytes = unittest.expectedFailure(test_bytes)

def test_case(self):
ignorecase = os.path.normcase('ABC') == os.path.normcase('abc')
check = self.check_match
Expand Down
61 changes: 29 additions & 32 deletions Lib/test/test_ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,6 @@ def test_realpath_strict(self):
self.assertRaises(FileNotFoundError, ntpath.realpath, ABSTFN, strict=True)
self.assertRaises(FileNotFoundError, ntpath.realpath, ABSTFN + "2", strict=True)

# TODO: RUSTPYTHON, TypeError: got an unexpected keyword argument 'strict'
if sys.platform == "win32":
test_realpath_strict = unittest.expectedFailure(test_realpath_strict)

@os_helper.skip_unless_symlink
@unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
def test_realpath_relative(self):
Expand Down Expand Up @@ -354,7 +350,6 @@ def test_realpath_broken_symlinks(self):
self.assertPathEqual(ntpath.realpath(b"broken5"),
os.fsencode(ABSTFN + r"\missing"))

@unittest.skip("TODO: RUSTPYTHON, leaves behind TESTFN")
@os_helper.skip_unless_symlink
@unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
def test_realpath_symlink_loops(self):
Expand Down Expand Up @@ -446,10 +441,6 @@ def test_realpath_symlink_loops_strict(self):
self.assertRaises(OSError, ntpath.realpath, ntpath.basename(ABSTFN),
strict=True)

# TODO: RUSTPYTHON, FileExistsError: [Errno 183] Cannot create a file when that file already exists. (os error 183): 'None' -> 'None'
if sys.platform == "win32":
test_realpath_symlink_loops_strict = unittest.expectedFailure(test_realpath_symlink_loops_strict)

@os_helper.skip_unless_symlink
@unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
def test_realpath_symlink_prefix(self):
Expand Down Expand Up @@ -517,7 +508,6 @@ def test_realpath_cwd(self):
with os_helper.change_cwd(test_dir_short):
self.assertPathEqual(test_file_long, ntpath.realpath("file.txt"))

@unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, ValueError: illegal environment variable name")
def test_expandvars(self):
with os_helper.EnvironmentVarGuard() as env:
env.clear()
Expand All @@ -544,7 +534,10 @@ def test_expandvars(self):
tester('ntpath.expandvars("\'%foo%\'%bar")', "\'%foo%\'%bar")
tester('ntpath.expandvars("bar\'%foo%")', "bar\'%foo%")

@unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, ValueError: illegal environment variable name")
# TODO: RUSTPYTHON, ValueError: illegal environment variable name
if sys.platform == 'win32':
test_expandvars = unittest.expectedFailure(test_expandvars)

@unittest.skipUnless(os_helper.FS_NONASCII, 'need os_helper.FS_NONASCII')
def test_expandvars_nonascii(self):
def check(value, expected):
Expand All @@ -565,8 +558,10 @@ def check(value, expected):
check('%spam%bar', '%sbar' % nonascii)
check('%{}%bar'.format(nonascii), 'ham%sbar' % nonascii)

# TODO: RUSTPYTHON
@unittest.expectedFailure
# TODO: RUSTPYTHON, ValueError: illegal environment variable name
if sys.platform == 'win32':
test_expandvars_nonascii = unittest.expectedFailure(test_expandvars_nonascii)

def test_expanduser(self):
tester('ntpath.expanduser("test")', 'test')

Expand Down Expand Up @@ -614,7 +609,9 @@ def test_expanduser(self):
tester('ntpath.expanduser("~test")', '~test')
tester('ntpath.expanduser("~")', 'C:\\Users\\eric')


# TODO: RUSTPYTHON
if sys.platform == 'win32':
test_expanduser = unittest.expectedFailure(test_expanduser)

@unittest.skipUnless(nt, "abspath requires 'nt' module")
def test_abspath(self):
Expand Down Expand Up @@ -809,14 +806,6 @@ class NtCommonTest(test_genericpath.CommonTest, unittest.TestCase):
pathmodule = ntpath
attributes = ['relpath']

@unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, ValueError: illegal environment variable name")
def test_expandvars(self): # TODO: RUSTPYTHON, remove when this passes
super().test_expandvars() # TODO: RUSTPYTHON, remove when this passes

@unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, ValueError: illegal environment variable name")
def test_expandvars_nonascii(self): # TODO: RUSTPYTHON, remove when this passes
super().test_expandvars_nonascii() # TODO: RUSTPYTHON, remove when this passes

# TODO: RUSTPYTHON
if sys.platform == "linux":
@unittest.expectedFailure
Expand All @@ -825,26 +814,34 @@ def test_nonascii_abspath(self):

# TODO: RUSTPYTHON
if sys.platform == "win32":
# TODO: RUSTPYTHON, ValueError: illegal environment variable name
@unittest.expectedFailure
def test_expandvars(self): # TODO: RUSTPYTHON; remove when done
super().test_expandvars()

# TODO: RUSTPYTHON, ValueError: illegal environment variable name
@unittest.expectedFailure
def test_samefile(self):
def test_expandvars_nonascii(self): # TODO: RUSTPYTHON; remove when done
super().test_expandvars_nonascii()

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_samefile(self): # TODO: RUSTPYTHON; remove when done
super().test_samefile()

# TODO: RUSTPYTHON
if sys.platform == "win32":
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_samefile_on_link(self):
def test_samefile_on_link(self): # TODO: RUSTPYTHON; remove when done
super().test_samefile_on_link()

# TODO: RUSTPYTHON
if sys.platform == "win32":
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_samestat(self):
def test_samestat(self): # TODO: RUSTPYTHON; remove when done
super().test_samestat()

# TODO: RUSTPYTHON
if sys.platform == "win32":
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_samestat_on_link(self):
def test_samestat_on_link(self): # TODO: RUSTPYTHON; remove when done
super().test_samestat_on_link()


Expand Down