[Psyco-checkins] CVS: psyco/test basetests.py,1.4,1.5 btrun.py,1.6,1.7 regrtester.py,1.5,1.6 test3.py,1.1,1.2 test5.py,1.3,1.4

[Armin R. <ar...@us...>]

Update of /cvsroot/psyco/psyco/test
In directory sc8-pr-cvs1:/tmp/cvs-serv27705/test

Modified Files:
	basetests.py btrun.py regrtester.py test3.py test5.py 
Log Message:
more bugfixes, better sys._getframe() support, more 2.3b1 compliance

Index: basetests.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/basetests.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** basetests.py	26 Apr 2003 21:01:27 -0000	1.4
--- basetests.py	29 Apr 2003 15:26:15 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  
  import sys, os, random, doctest, cStringIO
+ True,False = 1==1,1==0
  
  

Index: btrun.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/btrun.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** btrun.py	26 Apr 2003 21:01:27 -0000	1.6
--- btrun.py	29 Apr 2003 15:26:15 -0000	1.7
***************
*** 35,56 ****
                               ###################
  
- >>> print 'abcdefghijklmnop'=='abcdefghijklMNop'
- ${False}
- 
- >>> print 'abcdefghijklmnop'=='abcdefghijklmnop'
- ${True}
- 
- >>> print str('abcdefghijklmnop'=='abcdefghijklMNop')
- ${False}
- 
- >>> print str('abcdefghijklmnop'=='abcdefghijklmnop')
- ${True}
- 
- >>> print (lambda x: x==1)(0)
- ${False}
- 
- >>> print (lambda x: x==1)(1)
- ${True}
- 
  >>> print test1.f1(217)
  1115467
--- 35,38 ----
***************
*** 243,254 ****
  ['float', 'list', 'urllib', 'psyco.classes', 'full']
  
! >>> test3.N=5; print test3.f28()
  test_getframe():
  test_getframe
  f28
  ?
  5
  
! >>> print test3.f27()
  test_getframe():
  test_getframe
--- 225,250 ----
  ['float', 'list', 'urllib', 'psyco.classes', 'full']
  
! >>> test3.N=5; print test3.f28(), test3.f28_1(), test3.f28_b(), test3.f28_b1()
  test_getframe():
  test_getframe
  f28
  ?
+ 5 test_getframe():
+ test_getframe
+ test_getframe1
+ f28_1
+ ?
+ 5 test_getframe_b():
+ test_getframe_b
+ f28_b
+ ?
+ 5 test_getframe_b():
+ test_getframe_b
+ test_getframe_b1
+ f28_b1
+ ?
  5
  
! >>> print test3.f27(), test3.f27_1(), test3.f27_b(), test3.f27_b1()
  test_getframe():
  test_getframe
***************
*** 266,270 ****
  f27
  ?
! (5, 6, 7)
  
  >>> print test3.f29(range(10,0,-1))
--- 262,317 ----
  f27
  ?
! (5, 6, 7) test_getframe():
! test_getframe
! test_getframe1
! f28_1
! f27_1
! ?
! test_getframe():
! test_getframe
! test_getframe1
! f28_1
! f27_1
! ?
! test_getframe():
! test_getframe
! test_getframe1
! f28_1
! f27_1
! ?
! (51, 61, 71) test_getframe_b():
! test_getframe_b
! f28_b
! f27_b
! ?
! test_getframe_b():
! test_getframe_b
! f28_b
! f27_b
! ?
! test_getframe_b():
! test_getframe_b
! f28_b
! f27_b
! ?
! (95, 96, 97) test_getframe_b():
! test_getframe_b
! test_getframe_b1
! f28_b1
! f27_b1
! ?
! test_getframe_b():
! test_getframe_b
! test_getframe_b1
! f28_b1
! f27_b1
! ?
! test_getframe_b():
! test_getframe_b
! test_getframe_b1
! f28_b1
! f27_b1
! ?
! (951, 961, 971)
  
  >>> print test3.f29(range(10,0,-1))
***************
*** 364,365 ****
--- 411,423 ----
  >>> print test5.overflowtest()
  -3851407362L
+ 
+ >>> test5.booltest()
+ ${False}
+ ${True}
+ ${False}
+ ${True}
+ ${False}
+ ${True}
+ ${[a & b for a in (False,True) for b in (False,True)]}
+ ${[a | b for a in (False,True) for b in (False,True)]}
+ ${[a ^ b for a in (False,True) for b in (False,True)]}

Index: regrtester.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/regrtester.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** regrtester.py	15 Mar 2003 13:14:28 -0000	1.5
--- regrtester.py	29 Apr 2003 15:26:16 -0000	1.6
***************
*** 22,33 ****
          'test_coercion': 'uses eval() with locals',
          'test_richcmp': 'uses eval() with locals',
          'test_longexp': 'run it separately if you want, but it takes time and memory',
          'test_weakref': 'only run with FULL_CONTROL_FLOW set to 0 in mergepoints.c',
          'test_gettext': 'gettext mutates _ in the builtins!',
          'test_richcmp': 'uses exec with locals',
!         'test_inspect': 'uses sys.exc_traceback.tb_frame.f_back',
!         'test_exceptions': 'uses sys.exc_traceback.tb_frame.f_back',
          'test_largefile': 'fails on Python on my old Linux box',
          'test_popen2': 'log file descriptor messed up in Python < 2.2.2',
          }
  if sys.version_info[:2] < (2,2):
--- 22,39 ----
          'test_coercion': 'uses eval() with locals',
          'test_richcmp': 'uses eval() with locals',
+         'test_sets': 'uses eval() with locals',
          'test_longexp': 'run it separately if you want, but it takes time and memory',
          'test_weakref': 'only run with FULL_CONTROL_FLOW set to 0 in mergepoints.c',
          'test_gettext': 'gettext mutates _ in the builtins!',
          'test_richcmp': 'uses exec with locals',
!         'test_inspect': 'isframe() does not recognize our Frame instances',
!         'test_exceptions': 'uses tb.tb_frame.f_back',
          'test_largefile': 'fails on Python on my old Linux box',
          'test_popen2': 'log file descriptor messed up in Python < 2.2.2',
+         'test_sys': 'getrefcount() cannot be reliably tested',
+         'test_socket': 'refcounting stuff as well',
+         'test_copy': 'xrange() is very similar to range() with Psyco',
+         'test_tarfile': 'we get permission denied with Python',
+         'test_optparse': 'uses "%(xyz)s" % locals()',
          }
  if sys.version_info[:2] < (2,2):
***************
*** 35,43 ****
  #    SKIP['test_operator'] = NO_SYS_EXC
  #    SKIP['test_strop'] = NO_SYS_EXC
! if sys.version_info[:2] >= (2,3):
!     SKIP['test_threadedtempfile'] = 'Python bug: Python test just hangs up'
  
  if hasattr(psyco._psyco, 'VERBOSE_LEVEL'):
      SKIP['test_popen2'] = 'gets confused by Psyco debugging output to stderr'
  #################################################################################
  
--- 41,53 ----
  #    SKIP['test_operator'] = NO_SYS_EXC
  #    SKIP['test_strop'] = NO_SYS_EXC
! #if sys.version_info[:2] >= (2,3):
! #    SKIP['test_threadedtempfile'] = 'Python bug: Python test just hangs up'
  
  if hasattr(psyco._psyco, 'VERBOSE_LEVEL'):
      SKIP['test_popen2'] = 'gets confused by Psyco debugging output to stderr'
+ 
+ if os.path.exists('regrtester.skip'):
+     execfile('regrtester.skip')
+ 
  #################################################################################
  

Index: test3.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/test3.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test3.py	17 Jan 2003 14:40:13 -0000	1.1
--- test3.py	29 Apr 2003 15:26:16 -0000	1.2
***************
*** 267,271 ****
  def test_getframe1():
      return test_getframe()
!     f(*x)  # prevents Psyco compilation
  
  def f28():
--- 267,284 ----
  def test_getframe1():
      return test_getframe()
!     exec ""  # prevents Psyco compilation
! 
! def test_getframe_b():
!     import sys
!     i = 0
!     print 'test_getframe_b():'
!     f = sys._getframe()
!     while f is not None:
!         print f.f_code.co_name
!         f = f.f_back    # walk the stack with f_back
! 
! def test_getframe_b1():
!     return test_getframe_b()
!     exec ""  # prevents Psyco compilation
  
  def f28():
***************
*** 273,277 ****
      return N
  
- #N=-1
  def f27():
      global N
--- 286,289 ----
***************
*** 282,285 ****
--- 294,339 ----
      N = 7
      c = f28()
+     return a,b,c
+ 
+ def f28_1():
+     test_getframe1()
+     return N
+ 
+ def f27_1():
+     global N
+     N = 51
+     a = f28_1()
+     N = 61
+     b = f28_1()
+     N = 71
+     c = f28_1()
+     return a,b,c
+ 
+ def f28_b():
+     test_getframe_b()
+     return N
+ 
+ def f27_b():
+     global N
+     N = 95
+     a = f28_b()
+     N = 96
+     b = f28_b()
+     N = 97
+     c = f28_b()
+     return a,b,c
+ 
+ def f28_b1():
+     test_getframe_b1()
+     return N
+ 
+ def f27_b1():
+     global N
+     N = 951
+     a = f28_b1()
+     N = 961
+     b = f28_b1()
+     N = 971
+     c = f28_b1()
      return a,b,c
  

Index: test5.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/test5.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test5.py	15 Mar 2003 13:14:47 -0000	1.3
--- test5.py	29 Apr 2003 15:26:17 -0000	1.4
***************
*** 35,38 ****
--- 35,50 ----
      return `n`
  
+ def booltest():
+     True,False = 1==1,1==0
+     print 'abcdefghijklmnop'=='abcdefghijklMNop'
+     print 'abcdefghijklmnop'=='abcdefghijklmnop'
+     print str('abcdefghijklmnop'=='abcdefghijklMNop')
+     print str('abcdefghijklmnop'=='abcdefghijklmnop')
+     print (lambda x: x==1)(0)
+     print (lambda x: x==1)(1)
+     print [a & b for a in (False,True) for b in (False,True)]
+     print [a | b for a in (False,True) for b in (False,True)]
+     print [a ^ b for a in (False,True) for b in (False,True)]
+ 
  
  if __name__ == '__main__':