Changeset: 8e9fa4a81029 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8e9fa4a81029
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: Jan2022
Log Message:
Fixing tests.
diffs (47 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
@@ -51,7 +51,6 @@ def worker_load(in_filename, workerrec,
# Setup and start workers
def create_workers(tmpdir, workers, fn_template, nworkers, cmovies,
ratings_table_def_fk):
for i in range(nworkers):
- workerport = freeport()
workerdbname = 'worker_{}'.format(i)
workerrec = {
'num': i,
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
@@ -60,7 +60,7 @@ def create_workers(TMPDIR, workers, fn_t
os.mkdir(workerrec['dbfarm'])
workerrec['proc'] = process.server(mapiport='0',
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
workerrec['port'] = workerrec['proc'].dbport
- workerrec['mapi'] =
'mapi:monetdb://localhost:{}/{}/sys/ratings'.format(workerrec['port'],
workerdbname),
+ workerrec['mapi'] =
'mapi:monetdb://localhost:{}/{}/sys/ratings'.format(workerrec['port'],
workerdbname)
workerrec['conn'] = pymonetdb.connect(database=workerrec['dbname'],
port=workerrec['port'], autocommit=True)
filename = fn_template.format(workerrec['num'])
t = threading.Thread(target=worker_load, args=[filename, workerrec,
cmovies, ratings_table_def_fk])
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
@@ -61,7 +61,7 @@ def create_workers(TMPDIR, workers, fn_t
os.mkdir(workerrec['dbfarm'])
workerrec['proc'] = process.server(mapiport='0',
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
workerrec['port'] = workerrec['proc'].dbport
- workerrec['mapi'] =
'mapi:monetdb://localhost:{}/{}/sys/ratings'.format(workerrec['port'],
workerdbname),
+ workerrec['mapi'] =
'mapi:monetdb://localhost:{}/{}/sys/ratings'.format(workerrec['port'],
workerdbname)
workerrec['conn'] = pymonetdb.connect(database=workerrec['dbname'],
port=workerrec['port'], autocommit=True)
filename = fn_template.format(workerrec['num'])
t = threading.Thread(target=worker_load, args=[filename, workerrec,
cmovies, ratings_table_def_fk])
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
@@ -647,7 +647,7 @@ with tempfile.TemporaryDirectory() as tm
os.mkdir(workerrec['dbfarm'])
workerrec['proc'] = process.server(mapiport='0',
dbname=workerrec['dbname'], dbfarm=workerrec['dbfarm'], stdin = process.PIPE,
stdout = process.PIPE, stderr=process.PIPE)
workerrec['port'] = workerrec['proc'].dbport
- workerrec['mapi'] = 'mapi:monetdb://localhost:%d/%s' %
(workerrec['port'], workerdbname),
+ workerrec['mapi'] =
'mapi:monetdb://localhost:{}/{}'.format(workerrec['port'], workerdbname)
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]
To unsubscribe send an email to [email protected]
