Changeset: 0a9999b56938 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a9999b56938
Modified Files:
        python/test/runtests.py
Branch: default
Log Message:

env stuff is actually used now by test


diffs (46 lines):

diff -r 08adc76a8eb0 -r 0a9999b56938 python/test/runtests.py
--- a/python/test/runtests.py   Sat May 22 13:09:39 2010 +0200
+++ b/python/test/runtests.py   Sat May 22 13:17:16 2010 +0200
@@ -42,6 +42,13 @@
 warnings.filterwarnings('error')
 
 
+MAPIPORT = int(os.environ.get('MAPIPORT', 50000))
+TSTDB = os.environ.get('TSTDB', 'demo')
+TSTHOSTNAME = os.environ.get('TSTHOSTNAME', 'localhost')
+TSTUSERNAME = os.environ.get('TSTUSERNAME', 'monetdb')
+TSTPASSWORD = os.environ.get('TSTPASSWORD', 'monetdb')
+ 
+
 class TextTestRunnerNoTime(unittest.TextTestRunner):
     """A test runner class that displays results in textual form, but without 
time """
     def run(self, test):
@@ -68,14 +75,10 @@
 
 
 class Test_Capabilities(capabilities.DatabaseTest):
-    MAPIPORT = int(os.environ.get('MAPIPORT', 50000))
-    TSTDB = os.environ.get('TSTDB', 'demo')
-    TSTHOSTNAME = os.environ.get('TSTHOSTNAME', 'localhost')
-    TSTUSERNAME = os.environ.get('TSTUSERNAME', 'monetdb')
-    TSTPASSWORD = os.environ.get('TSTPASSWORD', 'monetdb')
     db_module = monetdb.sql
     connect_args = ()
-    connect_kwargs = dict(database=TSTDB, port=MAPIPORT, autocommit=False)
+    connect_kwargs = dict(database=TSTDB, port=MAPIPORT, hostname=TSTHOSTNAME,
+            username=TSTUSERNAME, password=TSTPASSWORD, autocommit=False)
     leak_test = False
 
     def test_bigresult(self):
@@ -97,8 +100,9 @@
 
     driver = monetdb.sql
     connect_args = ()
-    connect_kw_args = {'database': TSTDB, 'port': MAPIPORT}
-
+    connect_kwargs = dict(database=TSTDB, port=MAPIPORT, hostname=TSTHOSTNAME,
+            username=TSTUSERNAME, password=TSTPASSWORD, autocommit=False)
+ 
     lower_func = 'lower' # For stored procedure test
 
     def executeDDL1(self,cursor):
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to