[Checkins] SVN: relstorage/trunk/relstorage/tests/ updated adapter constructor signature

[Shane Hathaway]

Log message for revision 104770:
  updated adapter constructor signature

Changed:
  U   relstorage/trunk/relstorage/tests/packstresstest.py
  U   relstorage/trunk/relstorage/tests/speedtest.py

-=-
Modified: relstorage/trunk/relstorage/tests/packstresstest.py
===================================================================
--- relstorage/trunk/relstorage/tests/packstresstest.py	2009-10-03 22:13:12 UTC (rev 104769)
+++ relstorage/trunk/relstorage/tests/packstresstest.py	2009-10-03 22:18:21 UTC (rev 104770)
@@ -3,6 +3,7 @@
 
 from ZODB.DB import DB
 from relstorage.storage import RelStorage
+from relstorage.options import Options
 import transaction
 from persistent.mapping import PersistentMapping
 import random
@@ -20,7 +21,7 @@
         db='packtest',
         user='relstoragetest',
         passwd='relstoragetest',
-        keep_history=keep_history,
+        options=Options(keep_history=keep_history),
         )
 elif use == 'postgresql':
     from relstorage.adapters.postgresql import PostgreSQLAdapter
@@ -28,7 +29,7 @@
         "dbname='packtest' "
         'user=relstoragetest '
         'password=relstoragetest',
-        keep_history=keep_history,
+        options=Options(keep_history=keep_history),
         )
 elif use == 'oracle':
     from relstorage.adapters.oracle import OracleAdapter
@@ -37,7 +38,7 @@
         user='packtest',
         password='relstoragetest',
         dsn=dsn,
-        keep_history=keep_history,
+        options=Options(keep_history=keep_history),
         )
 else:
     raise AssertionError("which database?")

Modified: relstorage/trunk/relstorage/tests/speedtest.py
===================================================================
--- relstorage/trunk/relstorage/tests/speedtest.py	2009-10-03 22:13:12 UTC (rev 104769)
+++ relstorage/trunk/relstorage/tests/speedtest.py	2009-10-03 22:18:21 UTC (rev 104770)
@@ -32,6 +32,7 @@
 from ZODB.DB import DB
 from ZODB.Connection import Connection
 
+from relstorage.options import Options
 from relstorage.storage import RelStorage
 
 debug = False
@@ -201,7 +202,8 @@
         else:
             db = 'relstoragetest_hf'
         dsn = 'dbname=%s user=relstoragetest password=relstoragetest' % db
-        adapter = PostgreSQLAdapter(dsn=dsn, keep_history=keep_history)
+        options = Options(keep_history=keep_history)
+        adapter = PostgreSQLAdapter(dsn=dsn, options=)
         adapter.schema.prepare()
         adapter.schema.zap_all()
         def make_storage():
@@ -215,11 +217,12 @@
             db = 'relstoragetest'
         else:
             db = 'relstoragetest_hf'
+        options = Options(keep_history=keep_history)
         adapter = OracleAdapter(
             user=db,
             password='relstoragetest',
             dsn=dsn,
-            keep_history=keep_history,
+            options=options,
             )
         adapter.schema.prepare()
         adapter.schema.zap_all()
@@ -233,11 +236,12 @@
             db = 'relstoragetest'
         else:
             db = 'relstoragetest_hf'
+        options = Options(keep_history=keep_history)
         adapter = MySQLAdapter(
+            options=options,
             db=db,
             user='relstoragetest',
             passwd='relstoragetest',
-            keep_history=keep_history,
             )
         adapter.schema.prepare()
         adapter.schema.zap_all()