Changeset: 5fb7bb7378a6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fb7bb7378a6
Modified Files:
sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
sql/test/Connections/Tests/connections.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
testing/process.py
Branch: Aug2011
Log Message:
Removed first (lang(uage)) parameter from process.server().
The function didn't use the argument anymore, and all callers used 'sql'.
diffs (190 lines):
diff --git a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
--- a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
+++ b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
@@ -19,7 +19,7 @@ create table t2 (a int);
'''
def main():
- s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
+ s = process.server(args = ["--set", "gdk_readonly=yes"],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
--- a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
+++ b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
@@ -7,8 +7,7 @@ except ImportError:
import process
def server():
- return process.server('sql',
- stdin = process.PIPE,
+ return process.server(stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
--- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
+++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
@@ -4,6 +4,6 @@ except ImportError:
import process
import os
-s = process.server(lang = 'sql', args = ['--readonly'],
+s = process.server(args = ['--readonly'],
dbname = '%s-2695' % os.getenv('TSTDB'))
s.wait()
diff --git a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
--- a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
+++ b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
@@ -4,7 +4,7 @@ try:
except ImportError:
import process
-srv = process.server('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+srv = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
clt = process.client('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
out, err = clt.communicate('select 1;\n')
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
+++ b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
@@ -7,7 +7,7 @@ except ImportError:
def server_start(args):
sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE,
+ srv = process.server(args = args, stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
--- a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
+++ b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
@@ -4,10 +4,10 @@ try:
except ImportError:
import process
-def server_start(lang):
+def server_start():
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server(lang, stdin = process.PIPE,
+ srv = process.server(stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
@@ -20,7 +20,7 @@ def client(lang, file, user = 'monetdb',
return clt.communicate()
def main():
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_create_user.sql'))
@@ -30,7 +30,7 @@ def main():
sys.stdout.write(out)
sys.stderr.write(err)
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_select.sql'),
@@ -41,7 +41,7 @@ def main():
sys.stdout.write(out)
sys.stderr.write(err)
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_drop_user.sql'))
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
--- a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
+++ b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
@@ -7,7 +7,7 @@ except ImportError:
def server_start(args = []):
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE,
+ srv = process.server(args = args, stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git a/sql/test/Connections/Tests/connections.py
b/sql/test/Connections/Tests/connections.py
--- a/sql/test/Connections/Tests/connections.py
+++ b/sql/test/Connections/Tests/connections.py
@@ -12,7 +12,7 @@ def remote_server_start(x,s):
sys.stdout.flush()
sys.stderr.flush()
port = os.getenv('MAPIPORT', '50000')
- srv = process.server('sql', mapiport = int(port) + 1,
+ srv = process.server(mapiport = int(port) + 1,
dbname = '%s_test1' % os.getenv('TSTDB'),
stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
@@ -25,7 +25,7 @@ def server_start(x,s):
sys.stderr.write('#mserver\n')
sys.stdout.flush()
sys.stderr.flush()
- srv = process.server('sql', stdin = process.PIPE,
+ srv = process.server(stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git
a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
--- a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
+++ b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
@@ -75,7 +75,7 @@ delete from t1 where a = 1;
'''
def main():
- s = process.server('sql', args = [],
+ s = process.server(args = [],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
@@ -85,7 +85,7 @@ def main():
client(script2)
client(script5)
server_stop(s)
- s = process.server('sql', args = ["--readonly"],
+ s = process.server(args = ["--readonly"],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
--- a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
+++ b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
@@ -67,7 +67,7 @@ delete from v1 where a = 3;
'''
def main():
- s = process.server('sql', args = [],
+ s = process.server(args = [],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
@@ -79,7 +79,7 @@ def main():
client(script11)
client(script12)
server_stop(s)
- s = process.server('sql', args = ["--readonly"],
+ s = process.server(args = ["--readonly"],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -293,7 +293,7 @@ def client(lang, args = [], stdin = None
p.stderr = _BufferedPipe(p.stderr)
return p
-def server(lang, args = [], stdin = None, stdout = None, stderr = None,
+def server(args = [], stdin = None, stdout = None, stderr = None,
mapiport = None, dbname = os.getenv('TSTDB'), dbfarm = None,
dbinit = None, bufsize = 0, log = False, notrace = False):
'''Start a server process.'''
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
