Skip to content
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.

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

Fix handling of Windows drive as root path #694

Merged
merged 1 commit into from
Jul 20, 2022
Merged
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@ The released versions correspond to PyPi releases.

## Unreleased

### Fixes
* fixed regression: `os.exists` returned `True` for any root drive path under Windows

## [Version 4.6.2](https://pypi.python.org/pypi/pyfakefs/4.6.2) (2022-07-14)
Patch release that fixes an error in the previous patch.

8 changes: 5 additions & 3 deletions pyfakefs/fake_filesystem.py
Original file line number Diff line number Diff line change
@@ -1923,9 +1923,11 @@ def is_mount_point(self, file_path: AnyStr) -> bool:
if (file_path == mount_point or not self.is_case_sensitive and
file_path.lower() == mount_point.lower()):
return True
if self.is_windows_fs:
return (2 <= len(file_path) <= 3 and
self.starts_with_drive_letter(file_path))
if (self.is_windows_fs and len(file_path) == 3 and
len(mount_point) == 2 and
self.starts_with_drive_letter(file_path) and
file_path[:2].lower() == mount_point.lower()):
return True
return False

def ends_with_path_separator(self, path: Union[int, AnyPath]) -> bool:
14 changes: 13 additions & 1 deletion pyfakefs/tests/fake_filesystem_test.py
Original file line number Diff line number Diff line change
@@ -23,7 +23,9 @@
import unittest

from pyfakefs import fake_filesystem
from pyfakefs.fake_filesystem import set_uid, set_gid, is_root, reset_ids
from pyfakefs.fake_filesystem import (
set_uid, set_gid, is_root, reset_ids, OSType
)
from pyfakefs.helpers import IS_WIN
from pyfakefs.tests.test_utils import TestCase, RealFsTestCase, time_mock

@@ -1023,6 +1025,16 @@ def test_exists(self):
self.assertTrue(self.path.exists(file_path_bytes))
self.assertFalse(self.path.exists('!some!other!bogus!path'))

def test_exists_with_drive(self):
self.filesystem.os = OSType.WINDOWS
self.filesystem.add_mount_point('F:')
self.assertTrue(self.path.exists('C:'))
self.assertTrue(self.path.exists('c:\\'))
self.assertTrue(self.path.exists('f:'))
self.assertTrue(self.path.exists('F:\\'))
self.assertFalse(self.path.exists('Z:'))
self.assertFalse(self.path.exists('z:\\'))

def test_lexists(self):
file_path = 'foo!bar!baz'
file_path_bytes = b'foo!bar!baz'
3 changes: 1 addition & 2 deletions pyfakefs/tests/fake_filesystem_unittest_test.py
Original file line number Diff line number Diff line change
@@ -866,8 +866,7 @@ def test_drivelike_path(self):
file_path = folder / 'C:/testfile'
file_path.parent.mkdir(parents=True)
file_path.touch()
# use str() to be Python 3.5 compatible
os.chdir(str(folder))
os.chdir(folder)
self.assertTrue(os.path.exists(str(file_path.relative_to(folder))))