Skip to content

Commit 4bd3289

Browse files
authored
Update resource from 3.13.5 (#5893)
1 parent 69545c0 commit 4bd3289

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Lib/test/test_resource.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import sys
33
import unittest
44
from test import support
5-
from test.support import os_helper, import_helper
5+
from test.support import import_helper
6+
from test.support import os_helper
67
import time
78

89
resource = import_helper.import_module('resource')
@@ -99,6 +100,7 @@ def test_fsize_toobig(self):
99100
except (OverflowError, ValueError):
100101
pass
101102

103+
@unittest.skipUnless(hasattr(resource, "getrusage"), "needs getrusage")
102104
def test_getrusage(self):
103105
self.assertRaises(TypeError, resource.getrusage)
104106
self.assertRaises(TypeError, resource.getrusage, 42, 42)
@@ -140,7 +142,7 @@ def test_pagesize(self):
140142
self.assertIsInstance(pagesize, int)
141143
self.assertGreaterEqual(pagesize, 0)
142144

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

179181

180-
def test_main(verbose=None):
181-
support.run_unittest(ResourceTest)
182-
183182
if __name__ == "__main__":
184-
test_main()
183+
unittest.main()

stdlib/src/resource.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ mod resource {
9292
let tv = |tv: libc::timeval| tv.tv_sec as f64 + (tv.tv_usec as f64 / 1_000_000.0);
9393
Self {
9494
ru_utime: tv(rusage.ru_utime),
95-
ru_stime: tv(rusage.ru_utime),
95+
ru_stime: tv(rusage.ru_stime),
9696
ru_maxrss: rusage.ru_maxrss,
9797
ru_ixrss: rusage.ru_ixrss,
9898
ru_idrss: rusage.ru_idrss,

0 commit comments

Comments
 (0)