diff options
| author | Rick Morrison <rickmorrison@gmail.com> | 2007-02-15 00:22:07 +0000 |
|---|---|---|
| committer | Rick Morrison <rickmorrison@gmail.com> | 2007-02-15 00:22:07 +0000 |
| commit | 66a74c136fbb16e81efeb3e4e42c8e6dc7519dd1 (patch) | |
| tree | 4dd10c1669358574b0850ac384dcadb81c49e584 /test/testbase.py | |
| parent | d796ed2f8ec39264737a3ce0c66013c5c42d104d (diff) | |
| download | sqlalchemy-66a74c136fbb16e81efeb3e4e42c8e6dc7519dd1.tar.gz | |
revert old unittest patch for MSSQL
Diffstat (limited to 'test/testbase.py')
| -rw-r--r-- | test/testbase.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/testbase.py b/test/testbase.py index b35c5e7ff..1dbd654c7 100644 --- a/test/testbase.py +++ b/test/testbase.py @@ -16,7 +16,6 @@ from sqlalchemy.orm import clear_mappers db = None metadata = None db_uri = None -db_opts = {} echo = True # redefine sys.stdout so all those print statements go to the echo func @@ -34,7 +33,7 @@ def echo_text(text): def parse_argv(): # we are using the unittest main runner, so we are just popping out the # arguments we need instead of using our own getopt type of thing - global db, db_uri, db_opts, metadata + global db, db_uri, metadata DBTYPE = 'sqlite' PROXY = False @@ -62,9 +61,7 @@ def parse_argv(): elif options.db: DBTYPE = param = options.db - if DBTYPE == 'mssql': - db_opts['auto_identity_insert'] = True - + opts = {} if (None == db_uri): if DBTYPE == 'sqlite': db_uri = 'sqlite:///:memory:' @@ -78,7 +75,7 @@ def parse_argv(): db_uri = 'oracle://scott:tiger@127.0.0.1:1521' elif DBTYPE == 'oracle8': db_uri = 'oracle://scott:tiger@127.0.0.1:1521' - db_opts = {'use_ansi':False, 'auto_setinputsizes':True} + opts = {'use_ansi':False, 'auto_setinputsizes':True} elif DBTYPE == 'mssql': db_uri = 'mssql://scott:tiger@SQUAWK\\SQLEXPRESS/test' elif DBTYPE == 'firebird': @@ -101,11 +98,11 @@ def parse_argv(): with_coverage = options.coverage if options.enginestrategy is not None: - db_opts['strategy'] = options.enginestrategy + opts['strategy'] = options.enginestrategy if options.mockpool: - db = engine.create_engine(db_uri, poolclass=pool.AssertionPool, **db_opts) + db = engine.create_engine(db_uri, poolclass=pool.AssertionPool, **opts) else: - db = engine.create_engine(db_uri, **db_opts) + db = engine.create_engine(db_uri, **opts) db = EngineAssert(db) if options.topological: @@ -421,3 +418,4 @@ def main(): sys.exit(not result.wasSuccessful()) + |