Skip to content
Merged
Show file tree
Hide file tree
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
24 changes: 22 additions & 2 deletions Lib/test/test_os/test_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@
HAVE_WHEEL_GROUP = sys.platform.startswith('freebsd') and os.getgid() == 0


def _get_file_attribute_mask():
mask = 0
for name in dir(stat):
if name.startswith("FILE_ATTRIBUTE_"):
mask |= getattr(stat, name)
return mask


# gh-126253: Ignore unknown attributes, such as 0x1_000_0000
# (Directory flag of DOS file attribute in NTFS)
FILE_ATTRIBUTE_MASK = _get_file_attribute_mask()
Comment thread
vstinner marked this conversation as resolved.
Resolved


def requires_os_func(name):
return unittest.skipUnless(hasattr(os, name), 'requires os.%s' % name)

Expand Down Expand Up @@ -5032,8 +5045,15 @@ def assert_stat_equal(self, stat1, stat2, skip_fields):
if attr in ("st_dev", "st_ino", "st_nlink", "st_ctime",
"st_ctime_ns"):
continue
self.assertEqual(getattr(stat1, attr),
getattr(stat2, attr),
value1 = getattr(stat1, attr)
value2 = getattr(stat2, attr)
if attr == "st_file_attributes":
# Filesystems may report attribute bits that aren't
# exposed by the stat module.
value1 &= FILE_ATTRIBUTE_MASK
value2 &= FILE_ATTRIBUTE_MASK
self.assertEqual(value1,
value2,
(stat1, stat2, attr))
else:
self.assertEqual(stat1, stat2)
Expand Down
Comment thread
hugovk marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix ``test_os.test_attributes()`` on Windows NTFS: ignore unknown file attributes.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not convinced this needs a NEWS entry at all.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue #126253 is failing for at least 2 years, IMO it's ok to document the fix. At the beginning, the NEWS entry was way longer, Hugo rewrote it to make it shorter.

Anyway, your comment was posted after I enabled auto-merge and the change was just merged with the NEWS entry in the meanwhile. Sorry! So I will just backport it as it is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(My shortening was applying Victor's suggestion :)

Loading