Changeset 999687e

Timestamp:

12/06/10 15:25:00 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

master, external, fix-prolong, refactor, refactor-ext, refactor-subsolvers

Children:

ee6f189

Parents:

52a2f01

git-author:

Oleg Batrashev <ogbash@…> (12/06/10 15:25:00)

git-committer:

Oleg Batrashev <ogbash@…> (12/06/10 15:25:00)

Message:

In testcompare script read conf.

File:

• scripts/testcompare.py (modified) (3 diffs)

scripts/testcompare.py

@@ -3 +3 @@
 import MySQLdb
 import sys
+import getopt
 import logging
 logging.basicConfig()
@@ -8 +9 @@
 
 from doug import testmysql
+from doug.config import DOUGConfigParser
+
+def usage():
+    sys.stderr.write("Usage: %s\n"
+                     "\t [--conf=<filename>]...\n"
+                     % (sys.argv[0],))
+
+
+try:
+    opts, extra = getopt.getopt(sys.argv[1:], "", ["conf="])
+except getopt.GetoptError:
+    usage()
+    sys.exit(1)
+
+if len(extra)>0:
+    usage()
+    sys.exit(1)
+
+confFileNames = []
+for opt in opts:
+    if opt[0]=="--conf":
+        confFileNames.append(opt[1])
+
+# config and tar file
+conf = DOUGConfigParser()
+conf.read(confFileNames)
+
+host = conf.get("testscript", "mysql-host")
+user = conf.get("testscript", "mysql-user")
+password = conf.get("testscript", "mysql-password")
+database = conf.get("testscript", "mysql-database")
 
 class TestResult:
@@ -93 +125 @@
 def login():
     global connection
-    print "Enter mysql password:"
-    password = sys.stdin.readline().strip()
-
-    connection = MySQLdb.connect('localhost', 'dougtester', password, 'dougtests')
+    connection = MySQLdb.connect(host, user, password, database)
 
 login()