#1291: copy test_resource.py from the 2.6 trunk, to fix a test failure.

The 2.6 version also converts to unittest, but it seems to work fine under 2.5.

Lib/test/test_resource.py

@@ -1,37 +1,53 @@
-import os
+import unittest
+from test import test_support
+
 import resource
+import time
 
-from test.test_support import TESTFN, unlink
+# This test is checking a few specific problem spots with the resource module.
 
-# This test is checking a few specific problem spots.  RLIMIT_FSIZE
+class ResourceTest(unittest.TestCase):
-# should be RLIM_INFINITY, which will be a really big number on a
-# platform with large file support.  On these platforms, we need to
-# test that the get/setrlimit functions properly convert the number to
-# a C long long and that the conversion doesn't raise an error.
 
+    def test_args(self):
+        self.assertRaises(TypeError, resource.getrlimit)
+        self.assertRaises(TypeError, resource.getrlimit, 42, 42)
+        self.assertRaises(TypeError, resource.setrlimit)
+        self.assertRaises(TypeError, resource.setrlimit, 42, 42, 42)
+
+    def test_fsize_ismax(self):
         try:
-    cur, max = resource.getrlimit(resource.RLIMIT_FSIZE)
+            (cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
         except AttributeError:
             pass
         else:
-    print resource.RLIM_INFINITY == max
+            # RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really big
+            # number on a platform with large file support.  On these platforms,
+            # we need to test that the get/setrlimit functions properly convert
+            # the number to a C long long and that the conversion doesn't raise
+            # an error.
+            self.assertEqual(resource.RLIM_INFINITY, max)
             resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
 
-# Now check to see what happens when the RLIMIT_FSIZE is small.  Some
+    def test_fsize_enforced(self):
+        try:
+            (cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
+        except AttributeError:
+            pass
+        else:
+            # Check to see what happens when the RLIMIT_FSIZE is small.  Some
             # versions of Python were terminated by an uncaught SIGXFSZ, but
             # pythonrun.c has been fixed to ignore that exception.  If so, the
             # write() should return EFBIG when the limit is exceeded.
 
-# At least one platform has an unlimited RLIMIT_FSIZE and attempts to
+            # At least one platform has an unlimited RLIMIT_FSIZE and attempts
-# change it raise ValueError instead.
+            # to change it raise ValueError instead.
-
             try:
                 try:
                     resource.setrlimit(resource.RLIMIT_FSIZE, (1024, max))
-        limit_set = 1
+                    limit_set = True
                 except ValueError:
-        limit_set = 0
+                    limit_set = False
-    f = open(TESTFN, "wb")
+                f = open(test_support.TESTFN, "wb")
                 try:
                     f.write("X" * 1024)
                     try:
@@ -57,10 +73,16 @@ try:
             finally:
                 if limit_set:
                     resource.setrlimit(resource.RLIMIT_FSIZE, (cur, max))
-    unlink(TESTFN)
+                test_support.unlink(test_support.TESTFN)
 
-# And be sure that setrlimit is checking for really large values
+    def test_fsize_toobig(self):
+        # Be sure that setrlimit is checking for really large values
         too_big = 10L**50
+        try:
+            (cur, max) = resource.getrlimit(resource.RLIMIT_FSIZE)
+        except AttributeError:
+            pass
+        else:
             try:
                 resource.setrlimit(resource.RLIMIT_FSIZE, (too_big, max))
             except (OverflowError, ValueError):
@@ -69,3 +91,20 @@ try:
                 resource.setrlimit(resource.RLIMIT_FSIZE, (max, too_big))
             except (OverflowError, ValueError):
                 pass
+
+    def test_getrusage(self):
+        self.assertRaises(TypeError, resource.getrusage)
+        self.assertRaises(TypeError, resource.getrusage, 42, 42)
+        usageself = resource.getrusage(resource.RUSAGE_SELF)
+        usagechildren = resource.getrusage(resource.RUSAGE_CHILDREN)
+        # May not be available on all systems.
+        try:
+            usageboth = resource.getrusage(resource.RUSAGE_BOTH)
+        except (ValueError, AttributeError):
+            pass
+
+def test_main(verbose=None):
+    test_support.run_unittest(ResourceTest)
+
+if __name__ == "__main__":
+    test_main()