Changeset: a21d66903ebb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a21d66903ebb
Modified Files:
sql/test/remote/Tests/creds.SQL.py
sql/test/remote/Tests/different_user.SQL.py
sql/test/remote/Tests/invalid_creds.SQL.py
sql/test/remote/Tests/ssbm.SQL.py
Branch: default
Log Message:
Pipe server's stderr so the server keeps silent
diffs (85 lines):
diff --git a/sql/test/remote/Tests/creds.SQL.py
b/sql/test/remote/Tests/creds.SQL.py
--- a/sql/test/remote/Tests/creds.SQL.py
+++ b/sql/test/remote/Tests/creds.SQL.py
@@ -71,7 +71,7 @@ def create_workers(tmpdir, workers, fn_t
}
workers.append(workerrec)
os.mkdir(workerrec['dbfarm'])
- workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE)
+ workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
workerrec['conn'] = pymonetdb.connect(database=workerrec['dbname'],
port=workerport, autocommit=True)
filename = fn_template.format(workerrec['num'])
t = threading.Thread(target=worker_load, args=[filename, workerrec,
cmovies, ratings_table_def_fk])
@@ -90,7 +90,8 @@ with tempfile.TemporaryDirectory() as tm
with process.server(mapiport=supervisorport, dbname="supervisor",
dbfarm=os.path.join(tmpdir, "supervisor"),
stdin=process.PIPE,
- stdout=process.PIPE) as supervisorproc:
+ stdout=process.PIPE,
+ stderr=process.PIPE) as supervisorproc:
supervisorconn = pymonetdb.connect(database='supervisor',
port=supervisorport, autocommit=True)
supervisor_uri =
"mapi:monetdb://localhost:{}/supervisor".format(supervisorport)
c = supervisorconn.cursor()
diff --git a/sql/test/remote/Tests/different_user.SQL.py
b/sql/test/remote/Tests/different_user.SQL.py
--- a/sql/test/remote/Tests/different_user.SQL.py
+++ b/sql/test/remote/Tests/different_user.SQL.py
@@ -70,7 +70,7 @@ def create_workers(TMPDIR, workers, fn_t
}
workers.append(workerrec)
os.mkdir(workerrec['dbfarm'])
- workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE)
+ workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
workerrec['conn'] = pymonetdb.connect(database=workerrec['dbname'],
port=workerport, autocommit=True)
filename = fn_template.format(workerrec['num'])
t = threading.Thread(target=worker_load, args=[filename, workerrec,
cmovies, ratings_table_def_fk])
@@ -87,7 +87,7 @@ workers = []
with tempfile.TemporaryDirectory() as TMPDIR:
os.mkdir(os.path.join(TMPDIR, "supervisor"))
- with process.server(mapiport=supervisorport, dbname="supervisor",
dbfarm=os.path.join(TMPDIR, "supervisor"), stdin=process.PIPE,
stdout=process.PIPE) as supervisorproc:
+ with process.server(mapiport=supervisorport, dbname="supervisor",
dbfarm=os.path.join(TMPDIR, "supervisor"), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as supervisorproc:
supervisorconn = pymonetdb.connect(database='supervisor',
port=supervisorport, autocommit=True)
supervisor_uri =
"mapi:monetdb://localhost:{}/supervisor".format(supervisorport)
c = supervisorconn.cursor()
diff --git a/sql/test/remote/Tests/invalid_creds.SQL.py
b/sql/test/remote/Tests/invalid_creds.SQL.py
--- a/sql/test/remote/Tests/invalid_creds.SQL.py
+++ b/sql/test/remote/Tests/invalid_creds.SQL.py
@@ -71,7 +71,7 @@ def create_workers(TMPDIR, workers, fn_t
}
workers.append(workerrec)
os.mkdir(workerrec['dbfarm'])
- workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE)
+ workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
workerrec['conn'] = pymonetdb.connect(database=workerrec['dbname'],
port=workerport, autocommit=True)
filename = fn_template.format(workerrec['num'])
t = threading.Thread(target=worker_load, args=[filename, workerrec,
cmovies, ratings_table_def_fk])
@@ -87,7 +87,7 @@ supervisorproc = None
workers = []
with tempfile.TemporaryDirectory() as TMPDIR:
os.mkdir(os.path.join(TMPDIR, "supervisor"))
- with process.server(mapiport=supervisorport, dbname="supervisor",
dbfarm=os.path.join(TMPDIR, "supervisor"), stdin=process.PIPE,
stdout=process.PIPE) as supervisorproc:
+ with process.server(mapiport=supervisorport, dbname="supervisor",
dbfarm=os.path.join(TMPDIR, "supervisor"), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE) as supervisorproc:
supervisorconn = pymonetdb.connect(database='supervisor',
port=supervisorport, autocommit=True)
supervisor_uri =
"mapi:monetdb://localhost:{}/supervisor".format(supervisorport)
c = supervisorconn.cursor()
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -612,7 +612,7 @@ masterproc = None
workers = []
with tempfile.TemporaryDirectory() as tmpdir:
os.mkdir(os.path.join(tmpdir, 'master'))
- with process.server(mapiport=masterport, dbname="master",
dbfarm=os.path.join(tmpdir, 'master'), stdin = process.PIPE, stdout =
process.PIPE) as masterproc:
+ with process.server(mapiport=masterport, dbname="master",
dbfarm=os.path.join(tmpdir, 'master'), stdin = process.PIPE, stdout =
process.PIPE, stderr=process.PIPE) as masterproc:
masterconn = pymonetdb.connect(database='', port=masterport,
autocommit=True)
# split lineorder table into one file for each worker
@@ -656,7 +656,7 @@ with tempfile.TemporaryDirectory() as tm
}
workers.append(workerrec)
os.mkdir(workerrec['dbfarm'])
- workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin = process.PIPE,
stdout = process.PIPE)
+ workerrec['proc'] = process.server(mapiport=workerrec['port'],
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin = process.PIPE,
stdout = process.PIPE, stderr=process.PIPE)
workerrec['conn'] =
pymonetdb.connect(database=workerrec['dbname'], port=workerrec['port'],
autocommit=True)
t = threading.Thread(target=worker_load, args = [workerrec])
t.start()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
