diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index 103d0199d09..d7ff492d0f7 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -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') @@ -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) @@ -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): @@ -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() diff --git a/stdlib/src/resource.rs b/stdlib/src/resource.rs index a45d024b6c2..fdd9afcfbbd 100644 --- a/stdlib/src/resource.rs +++ b/stdlib/src/resource.rs @@ -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,