[pywin32-checkins] pywin32/adodbapi/tests adodbapitest.py, 1.12, 1.13 adodbapitestconfig.py, 1.10, 1.11 test_adodbapi_dbapi20.py, 1.6, 1.7 test.mdb, 1.1, NONE

[Vernon C. <kf...@us...>]

Update of /cvsroot/pywin32/pywin32/adodbapi/tests
In directory vz-cvs-2.sog:/tmp/cvs-serv3298

Modified Files:
	adodbapitest.py adodbapitestconfig.py test_adodbapi_dbapi20.py 
Removed Files:
	test.mdb 
Log Message:
fix adodbapi tests

Index: adodbapitest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitest.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** adodbapitest.py	16 Feb 2011 06:02:05 -0000	1.12
--- adodbapitest.py	26 Feb 2011 04:54:02 -0000	1.13
***************
*** 31,35 ****
      win32 = False
  
! import testADOdbapiConfig as config #will find (parent?) adodbapi
  import adodbapi
  try:
--- 31,38 ----
      win32 = False
  
! try:
!     import adodbapitestconfig as config #will find (parent?) adodbapi
! except ImportError:
!     import testADOdbapiConfig as config #alternate version
  import adodbapi
  try:

Index: test_adodbapi_dbapi20.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/test_adodbapi_dbapi20.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_adodbapi_dbapi20.py	31 Jul 2010 05:48:10 -0000	1.6
--- test_adodbapi_dbapi20.py	26 Feb 2011 04:54:02 -0000	1.7
***************
*** 18,22 ****
  print "Tested with dbapi20 %s" % dbapi20.__version__
  
! _computername=".\SQLEXPRESS" #or name of computer with SQL Server
  _databasename="Northwind" #or something else
  connStr = r"Provider=SQLOLEDB.1; Integrated Security=SSPI; Initial Catalog=%s;Data Source=%s" %(_databasename, _computername)
--- 18,22 ----
  print "Tested with dbapi20 %s" % dbapi20.__version__
  
! _computername="(local)" #or name of computer with SQL Server
  _databasename="Northwind" #or something else
  connStr = r"Provider=SQLOLEDB.1; Integrated Security=SSPI; Initial Catalog=%s;Data Source=%s" %(_databasename, _computername)

Index: adodbapitestconfig.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitestconfig.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** adodbapitestconfig.py	16 Feb 2011 06:02:05 -0000	1.10
--- adodbapitestconfig.py	26 Feb 2011 04:54:02 -0000	1.11
***************
*** 1,4 ****
  # Configure this in order to run the testcases.
! "testADOdbapiConfig.py v 2.4.0"
  
  import os
--- 1,4 ----
  # Configure this in order to run the testcases.
! "testADOdbapiConfig.py v 2.4.2"
  
  import os
***************
*** 23,27 ****
  print __doc__
  
! doAllTests = True
  doAccessTest = True or doAllTests
  doSqlServerTest = False or doAllTests
--- 23,27 ----
  print __doc__
  
! doAllTests = False   # switch to True for intensive testing
  doAccessTest = True or doAllTests
  doSqlServerTest = False or doAllTests

--- test.mdb DELETED ---