[Pypgsql-checkins] CVS: pypgsql/test/regression pgconnection.py,1.1,1.2

[Billy G. A. <bal...@us...>]

Update of /cvsroot/pypgsql/pypgsql/test/regression
In directory usw-pr-cvs1:/tmp/cvs-serv12027/test/regression

Modified Files:
	pgconnection.py 
Log Message:
30SEP2001 bga	Fixed some problems running the test cases on Python 2.0.


Index: pgconnection.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/test/regression/pgconnection.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pgconnection.py	2001/09/30 06:34:04	1.1
--- pgconnection.py	2001/09/30 23:09:19	1.2
***************
*** 35,38 ****
--- 35,40 ----
  # Date      Ini Description						|
  # --------- --- ------------------------------------------------------- |
+ # 30SEP2001 bga Fixed a problem with the PgVersion object test related	|
+ #		to the Python version running the test.			|
  # 17SEP2001 bga Initial release by Billy G. Allie.			|
  #-----------------------------------------------------------------------+
***************
*** 75,78 ****
--- 77,82 ----
  cnx = libpq.PQconnectdb("dbname=pypgsql")
  vstr = "%(major)d.%(minor)d.%(level)d" % cnx.version
+ vnbr = ((((cnx.version.major * 100) + cnx.version.minor) * 100) + \
+ 	cnx.version.level)
  
  class PgConnectionTestCases(unittest.TestCase):
***************
*** 89,96 ****
      def CheckMemberValues(self, cnx, expected):
  	for i in range(len(self.members)):
! 	    exec 'v = cnx.%s' % self.members[i]
! 	    self.assertEquals(v, expected[i],
! 			      'PgConnection.%s is %s, it should be %s!' % \
! 			      (self.members[i], v, expected[i]))
  
      def CheckForMethods(self, cnx):
--- 93,99 ----
      def CheckMemberValues(self, cnx, expected):
  	for i in range(len(self.members)):
! 	    exec 'v = (cnx.%s == expected[%d])' % (self.members[i], i)
! 	    self.assert_(v, 'PgConnection.%s is %s, it should be %s!' % \
! 			    (self.members[i], v, expected[i]))
  
      def CheckForMethods(self, cnx):
***************
*** 239,251 ****
  	cnx.reset()
  	expected = self.memtypes[:]
  	self.CheckMemberTypes(cnx, expected)
  	# Note: There is no way we can determine what the value of cnx.socket
! 	#	and cnx.backendPID are programtically.  Also errorMessage will
! 	#	contain a string at this time (from previous errors).
! 	#	Fill in the expected values from the connection.
  	cdef = self.cdef
  	expected = [cdef['host'], cdef['port'], 'pypgsql', cdef['tty'],
  		    cdef['user'], cdef['password'], self.cnx.backendPID,
! 		    self.cnx.socket, [], self.vstr, 0, cnx.errorMessage, 0, 0]
  	self.CheckMemberValues(cnx, expected)
  
--- 242,255 ----
  	cnx.reset()
  	expected = self.memtypes[:]
+ 	expected[11] = types.NoneType
  	self.CheckMemberTypes(cnx, expected)
  	# Note: There is no way we can determine what the value of cnx.socket
! 	#	and cnx.backendPID are programtically.
  	cdef = self.cdef
  	expected = [cdef['host'], cdef['port'], 'pypgsql', cdef['tty'],
  		    cdef['user'], cdef['password'], self.cnx.backendPID,
! 		    self.cnx.socket, [], self.vstr, 0, None, 0, 0]
! 	if version < 20100:
! 	    expected[9] = vnbr
  	self.CheckMemberValues(cnx, expected)
  
***************
*** 338,341 ****
--- 342,347 ----
  		    cdef['user'], cdef['password'], self.cnx.backendPID,
  		    self.cnx.socket, [], self.vstr, 0, None, 0, 0]
+ 	if version < 20100:
+ 	    expected[9] = vnbr
  	self.CheckMemberValues(cnx, expected)
  	# Test the hidden attribute, toggleShowQuery.