[pywin32-checkins] pywin32/win32/test handles.py, 1.4.2.1, 1.4.2.2 test_clipboard.py, 1.6.2.2, 1.6.2.3 test_security.py, 1.4, 1.4.4.1 test_win32event.py, 1.1.4.1, 1.1.4.2

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

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

Modified Files:
      Tag: py3k
	handles.py test_clipboard.py test_security.py 
	test_win32event.py 
Log Message:
merge lots of fixes from the trunk

Index: test_security.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_security.py,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** test_security.py	31 May 2005 02:07:35 -0000	1.4
--- test_security.py	27 Nov 2008 11:31:11 -0000	1.4.4.1
***************
*** 26,30 ****
          sacl.AddAuditAccessAce(win32security.ACL_REVISION,win32con.DELETE,admin_sid,1,1)
          sacl.AddAuditAccessAce(win32security.ACL_REVISION,win32con.GENERIC_ALL,pwr_sid,1,1)
!         for x in xrange(0,200000):
              sd1.SetSecurityDescriptorOwner(admin_sid,0)
              sd2.SetSecurityDescriptorGroup(pwr_sid,0)
--- 26,30 ----
          sacl.AddAuditAccessAce(win32security.ACL_REVISION,win32con.DELETE,admin_sid,1,1)
          sacl.AddAuditAccessAce(win32security.ACL_REVISION,win32con.GENERIC_ALL,pwr_sid,1,1)
!         for x in range(0,200000):
              sd1.SetSecurityDescriptorOwner(admin_sid,0)
              sd2.SetSecurityDescriptorGroup(pwr_sid,0)

Index: handles.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/handles.py,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** handles.py	26 Nov 2008 09:03:30 -0000	1.4.2.1
--- handles.py	27 Nov 2008 11:31:10 -0000	1.4.2.2
***************
*** 104,108 ****
          self.assertRaises(TypeError, pywintypes.HANDLE, ())
          # should be able to get a long!
!         pywintypes.HANDLE(0L)
  
  if __name__ == '__main__':
--- 104,108 ----
          self.assertRaises(TypeError, pywintypes.HANDLE, ())
          # should be able to get a long!
!         pywintypes.HANDLE(0)
  
  if __name__ == '__main__':

Index: test_clipboard.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_clipboard.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** test_clipboard.py	26 Nov 2008 07:17:39 -0000	1.6.2.2
--- test_clipboard.py	27 Nov 2008 11:31:11 -0000	1.6.2.3
***************
*** 60,64 ****
          CloseClipboard()
      def test_unicode(self):
!         val = u"test-\a9har"
          SetClipboardData(win32con.CF_UNICODETEXT, val)
          self.failUnlessEqual(GetClipboardData(win32con.CF_UNICODETEXT), val)
--- 60,64 ----
          CloseClipboard()
      def test_unicode(self):
!         val = "test-\a9har"
          SetClipboardData(win32con.CF_UNICODETEXT, val)
          self.failUnlessEqual(GetClipboardData(win32con.CF_UNICODETEXT), val)

Index: test_win32event.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32event.py,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** test_win32event.py	26 Nov 2008 07:17:39 -0000	1.1.4.1
--- test_win32event.py	27 Nov 2008 11:31:11 -0000	1.1.4.2
***************
*** 8,12 ****
      def testWaitableFire(self):
          h = win32event.CreateWaitableTimer(None, 0, None)
!         dt = -160L # 160 ns.
          win32event.SetWaitableTimer(h, dt, 0, None, None, 0)
          rc = win32event.WaitForSingleObject(h, 1000)
--- 8,12 ----
      def testWaitableFire(self):
          h = win32event.CreateWaitableTimer(None, 0, None)
!         dt = -160 # 160 ns.
          win32event.SetWaitableTimer(h, dt, 0, None, None, 0)
          rc = win32event.WaitForSingleObject(h, 1000)
***************
*** 16,20 ****
          h = win32event.CreateWaitableTimer(None, 0, None)
          # for the sake of this, pass a long that doesn't fit in an int.
!         dt = -2000000000L
          win32event.SetWaitableTimer(h, dt, 0, None, None, 0)
          rc = win32event.WaitForSingleObject(h, 10) # 10 ms.
--- 16,20 ----
          h = win32event.CreateWaitableTimer(None, 0, None)
          # for the sake of this, pass a long that doesn't fit in an int.
!         dt = -2000000000
          win32event.SetWaitableTimer(h, dt, 0, None, None, 0)
          rc = win32event.WaitForSingleObject(h, 10) # 10 ms.