Skip to content

Update resource from 3.13.5 #5893

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 2 commits into from
Jul 4, 2025
Merged

Update resource from 3.13.5 #5893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faa6443
Update resource from 3.13.5
ShaharNaveh Jul 3, 2025
2893e29
Remove extra newline
ShaharNaveh Jul 3, 2025
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
11 changes: 5 additions & 6 deletions Lib/test/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import sys
import unittest
from test import support
from test.support import os_helper, import_helper
from test.support import import_helper
from test.support import os_helper
import time

resource = import_helper.import_module('resource')
Expand Down Expand Up @@ -99,6 +100,7 @@ def test_fsize_toobig(self):
except (OverflowError, ValueError):
pass

@unittest.skipUnless(hasattr(resource, "getrusage"), "needs getrusage")
def test_getrusage(self):
self.assertRaises(TypeError, resource.getrusage)
self.assertRaises(TypeError, resource.getrusage, 42, 42)
Expand Down Expand Up @@ -140,7 +142,7 @@ def test_pagesize(self):
self.assertIsInstance(pagesize, int)
self.assertGreaterEqual(pagesize, 0)

@unittest.skipUnless(sys.platform == 'linux', 'test requires Linux')
@unittest.skipUnless(sys.platform in ('linux', 'android'), 'Linux only')
def test_linux_constants(self):
for attr in ['MSGQUEUE', 'NICE', 'RTPRIO', 'RTTIME', 'SIGPENDING']:
with contextlib.suppress(AttributeError):
Expand Down Expand Up @@ -177,8 +179,5 @@ def __getitem__(self, key):
limits)


def test_main(verbose=None):
support.run_unittest(ResourceTest)

if __name__ == "__main__":
test_main()
unittest.main()
2 changes: 1 addition & 1 deletion stdlib/src/resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod resource {
let tv = |tv: libc::timeval| tv.tv_sec as f64 + (tv.tv_usec as f64 / 1_000_000.0);
Rusage {
ru_utime: tv(rusage.ru_utime),
ru_stime: tv(rusage.ru_utime),
ru_stime: tv(rusage.ru_stime),
ru_maxrss: rusage.ru_maxrss,
ru_ixrss: rusage.ru_ixrss,
ru_idrss: rusage.ru_idrss,
Expand Down
Loading