[pywin32-checkins] pywin32/win32/Lib pywin32_testutil.py, 1.1.2.2, 1.1.2.3

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24579/win32/Lib

Modified Files:
      Tag: py3k
	pywin32_testutil.py 
Log Message:
merge recent changes from the trunk

Index: pywin32_testutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywin32_testutil.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** pywin32_testutil.py	7 Jan 2009 06:25:16 -0000	1.1.2.2
--- pywin32_testutil.py	25 Jan 2009 04:52:20 -0000	1.1.2.3
***************
*** 9,12 ****
--- 9,16 ----
  ##
  
+ def int2long(val):
+     """return a long on py2k"""
+     return val + 0x100000000 - 0x100000000
+ 
  # The test suite has lots of string constants containing binary data, but
  # the strings are used in various "bytes" contexts.
***************
*** 82,86 ****
              msg = "%d interface objects and %d gateway objects leaked" \
                                                          % (lost_i, lost_g)
!             result.addFailure(self.real_test, (AssertionError, msg, None))
  
      def runTest(self):
--- 86,91 ----
              msg = "%d interface objects and %d gateway objects leaked" \
                                                          % (lost_i, lost_g)
!             exc = AssertionError(msg)
!             result.addFailure(self.real_test, (exc.__class__, exc, None))
  
      def runTest(self):
***************
*** 109,113 ****
          if lost > 0:
              msg = "LeakTest: %s lost %d references" % (self.real_test, lost)
!             result.addFailure(self.real_test, (AssertionError, msg, None))
  
  
--- 114,119 ----
          if lost > 0:
              msg = "LeakTest: %s lost %d references" % (self.real_test, lost)
!             exc = AssertionError(msg)
!             result.addFailure(self.real_test, (exc.__class__, exc, None))