Update of /cvsroot/pypgsql/pypgsql/test/regression
In directory usw-pr-cvs1:/tmp/cvs-serv17622
Modified Files:
pgversion.py
Log Message:
16SEP2001 bga Corrected a mis-conception on my part about the handling of
exceptions generated in coercion functions by Python.
Index: pgversion.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/test/regression/pgversion.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pgversion.py 2001/09/14 04:05:00 1.1
--- pgversion.py 2001/09/17 04:35:24 1.2
***************
*** 34,37 ****
--- 34,38 ----
# Date Ini Description |
# --------- --- ------------------------------------------------------- |
+ # 16SEP2001 bga Change tests to reflect changes in pgversion.c. |
# 13SEP2001 bga Completed the test cases for PgVersion. |
# --- The coercion rules in Python 2.0 do not allow compari- |
***************
*** 108,114 ****
else:
vers == ''
! self.fail(
! 'Comparison to badly formatted string succeeded.'
! )
except ValueError, msg:
pass
--- 109,113 ----
else:
vers == ''
! self.fail('Comparison to badly formatted string succeeded.')
except ValueError, msg:
pass
***************
*** 120,126 ****
else:
vers == '7.1. 2'
! self.fail(
! 'Comparison to badly formatted string succeeded.'
! )
except ValueError, msg:
pass
--- 119,123 ----
else:
vers == '7.1. 2'
! self.fail('Comparison to badly formatted string succeeded.')
except ValueError, msg:
pass
***************
*** 132,138 ****
else:
vers == '7.1Test'
! self.fail(
! 'Comparison to badly formatted string succeeded.'
! )
except ValueError, msg:
pass
--- 129,133 ----
else:
vers == '7.1Test'
! self.fail('Comparison to badly formatted string succeeded.')
except ValueError, msg:
pass
***************
*** 199,231 ****
# Now test coercions that will fail.
! a, b = coerce(vers, '')
! self.failUnless(type(a) == type(b) == type(vers),
! 'Coercion from coerce to PgVersion failed.')
! expected = ['Ivalid format for PgVersion construction.',
! ValueError, None, None, None]
! self.CheckMemberValues(b, expected)
! a, b = coerce(vers, '7. 1.3')
! self.failUnless(type(a) == type(b) == type(vers),
! 'Coercion from coerce to PgVersion failed.')
! expected = ['Ivalid format for PgVersion construction.',
! ValueError, None, None, None]
! self.CheckMemberValues(b, expected)
! a, b = coerce(vers, 4294967296L)
! self.failUnless(type(a) == type(b) == type(vers),
! 'Coercion from long to PgVersion failed.')
! expected = ['long int too large to convert',
! OverflowError, None, None, None]
! if version < 20100:
! expected[0] = 'long int too long to convert'
! self.CheckMemberValues(b, expected)
! a, b = coerce(vers, 4294967296.0)
! self.failUnless(type(a) == type(b) == type(vers),
! 'Coercion from float to PgVersion failed.')
! expected = ['float too large to convert',
! OverflowError, None, None, None]
! self.CheckMemberValues(b, expected)
def CheckPgVersionSanity(self):
--- 194,220 ----
# Now test coercions that will fail.
! try:
! a, b = coerce(vers, '')
! self.fail('Comparison to badly formatted string succeeded.')
! except ValueError, msg:
! pass
! try:
! a, b = coerce(vers, '7. 1.3')
! self.fail('Comparison to badly formatted string succeeded.')
! except ValueError, msg:
! pass
! try:
! a, b = coerce(vers, 4294967296L)
! self.fail('Comparison to large valued long succeeded.')
! except OverflowError, msg:
! pass
! try:
! a, b = coerce(vers, 4294967296.0)
! self.fail('Comparison to large valued float succeeded.')
! except OverflowError, msg:
! pass
def CheckPgVersionSanity(self):
|
