[Python-checkins] python/dist/src/Lib/test regrtest.py,1.121,1.122 test_support.py,1.47,1.48

[fdrake@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv17119

Modified Files:
	regrtest.py test_support.py 
Log Message:
test_support.requires():  Instead of raising TestSkipped, raise a new
exception, ResourceDenied.  This is used to distinguish between tests that
are skipped for other reasons (platform support, missing data, etc.) from
those that are skipped because a "resource" has not been enabled.  This
prevents those tests from being reported as unexpected skips for the
platform; those should only be considered unexpected skips if the resource
were enabled.


Index: regrtest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** regrtest.py	3 Feb 2003 11:54:39 -0000	1.121
--- regrtest.py	3 Feb 2003 15:19:27 -0000	1.122
***************
*** 197,200 ****
--- 197,201 ----
      bad = []
      skipped = []
+     resource_denieds = []
  
      if findleaks:
***************
*** 264,267 ****
--- 265,270 ----
          else:
              skipped.append(test)
+             if ok == -2:
+                 resource_denieds.append(test)
          if findleaks:
              gc.collect()
***************
*** 300,304 ****
          plat = sys.platform
          if e.isvalid():
!             surprise = Set(skipped) - e.getexpected()
              if surprise:
                  print count(len(surprise), "skip"), \
--- 303,307 ----
          plat = sys.platform
          if e.isvalid():
!             surprise = Set(skipped) - e.getexpected() - Set(resource_denieds)
              if surprise:
                  print count(len(surprise), "skip"), \
***************
*** 396,399 ****
--- 399,407 ----
          finally:
              sys.stdout = save_stdout
+     except test_support.ResourceDenied, msg:
+         if not quiet:
+             print test, "skipped --", msg
+             sys.stdout.flush()
+         return -2
      except (ImportError, test_support.TestSkipped), msg:
          if not quiet:

Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** test_support.py	4 Dec 2002 03:26:57 -0000	1.47
--- test_support.py	3 Feb 2003 15:19:30 -0000	1.48
***************
*** 22,25 ****
--- 22,33 ----
      """
  
+ class ResourceDenied(TestSkipped):
+     """Test skipped because it requested a disallowed resource.
+ 
+     This is raised when a test calls requires() for a resource that
+     has not be enabled.  It is used to distinguish between expected
+     and unexpected skips.
+     """
+ 
  verbose = 1              # Flag set to 0 by regrtest.py
  use_resources = None       # Flag set to [] by regrtest.py
***************
*** 58,62 ****
          if msg is None:
              msg = "Use of the `%s' resource not enabled" % resource
!         raise TestSkipped(msg)
  
  FUZZ = 1e-6
--- 66,70 ----
          if msg is None:
              msg = "Use of the `%s' resource not enabled" % resource
!         raise ResourceDenied(msg)
  
  FUZZ = 1e-6