Changeset: f3c7c9635e0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3c7c9635e0d
Added Files:
sql/test/BugTracker-2019/Tests/SingleServer
sql/test/BugTracker-2020/Tests/SingleServer
Modified Files:
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.SQL.py
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.SQL.py
sql/test/merge-partitions/Tests/mergepart23.SQL.py
sql/test/merge-partitions/Tests/mergepart23.stable.out
Branch: Nov2019
Log Message:
Added Single Server runs for BugTrackers 2019 and 2020. Also make sure that
tests that start they own servers, the clients connect to those servers
diffs (truncated from 431 to 300 lines):
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
--- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
@@ -15,15 +15,18 @@ def freeport():
farm_dir = tempfile.mkdtemp()
os.mkdir(os.path.join(farm_dir, 'db1'))
+myport = freeport()
-s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
c = process.client(lang = 'sqldump',
+ port=myport,
+ dbname='db1',
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE,
diff --git
a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
--- a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
@@ -13,10 +13,11 @@ def freeport():
farm_dir = tempfile.mkdtemp()
os.mkdir(os.path.join(farm_dir, 'db1'))
+myport = freeport()
-s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
-c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
+c = process.client('sql', port=myport, dbname='db1', stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
out, err = c.communicate('''start transaction;
create table table3282 (i int);
insert into table3282 values (0);
@@ -49,9 +50,9 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
-c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
+c = process.client('sql', port=myport, dbname='db1', stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
out, err = c.communicate('''select * from table3282 offset 2097140;
''')
sys.stdout.write(out)
@@ -59,9 +60,9 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
-c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
+c = process.client('sql', port=myport, dbname='db1', stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
out, err = c.communicate('''select * from table3282 offset 2097140;
drop table table3282;
''')
diff --git a/sql/test/BugTracker-2019/Tests/SingleServer
b/sql/test/BugTracker-2019/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2019/Tests/SingleServer
@@ -0,0 +1,2 @@
+--set embedded_py=3
+--set embedded_r=true
diff --git a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
--- a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
+++ b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
@@ -1,13 +1,22 @@
-import sys
-
+import os, socket, sys, tempfile, shutil
try:
from MonetDBtesting import process
except ImportError:
import process
+def freeport():
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sock.bind(('', 0))
+ port = sock.getsockname()[1]
+ sock.close()
+ return port
+
+farm_dir = tempfile.mkdtemp()
+os.mkdir(os.path.join(farm_dir, 'db1'))
+myport = freeport()
def client(input):
- c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+ c = process.client('sql', port = myport, dbname='db1', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
out, err = c.communicate(input)
sys.stdout.write(out)
sys.stderr.write(err)
@@ -17,22 +26,26 @@ def server_stop(s):
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
client('''\
create table t (a int, b int, c int);\
alter table t add unique (b);
''')
server_stop(s)
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
client('alter table t drop column c;')
server_stop(s)
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
client('alter table t drop column b; --error, b has a depenency')
server_stop(s)
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
client('''\
select count(*) from objects inner join dependencies on objects.id =
dependencies.depend_id inner join columns on dependencies.id = columns.id inner
join tables on columns.table_id = tables.id where tables.name = 't';\
select count(*) from dependencies inner join columns on dependencies.id =
columns.id inner join tables on columns.table_id = tables.id where tables.name
= 't';\
@@ -46,7 +59,8 @@ select idxs.type, idxs.name from idxs in
''')
server_stop(s)
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+s = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
client('''\
drop table t;\
start transaction;\
@@ -68,3 +82,5 @@ select * from t;\
drop table t;
''')
server_stop(s)
+
+shutil.rmtree(farm_dir)
diff --git a/sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
b/sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
--- a/sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
+++ b/sql/test/BugTracker-2019/Tests/grant-select-column.Bug-6765.py
@@ -13,9 +13,6 @@ def client(next_user, next_passwd, input
sys.stdout.write(out)
sys.stderr.write(err)
-
-s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
-
client('monetdb', 'monetdb', '''\
CREATE schema "myschema";\
CREATE TABLE "myschema"."test" ("id" integer, "name" varchar(20));\
@@ -42,7 +39,3 @@ client('monetdb', 'monetdb', '''\
DROP USER myuser;\
DROP SCHEMA "myschema" CASCADE;
''')
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
--- a/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
+++ b/sql/test/BugTracker-2019/Tests/msqldump-mapi-cache.Bug-6777.py
@@ -5,8 +5,6 @@ try:
except ImportError:
import process
-s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
-
c = process.client('sql', stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
out, err = c.communicate('''\
start transaction;\
@@ -682,7 +680,3 @@ commit;
''')
sys.stdout.write(out)
sys.stderr.write(err)
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
--- a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
+++ b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
@@ -5,9 +5,6 @@ try:
except ImportError:
import process
-
-s = process.server(args = ['--set', 'embedded_py=3'], stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
-
c = process.client(lang = 'sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
out, err = c.communicate('''\
CREATE LOADER json_loader() LANGUAGE PYTHON {\n\
@@ -32,7 +29,3 @@ DROP LOADER json_loader;
''')
sys.stdout.write(out)
sys.stderr.write(err)
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2020/Tests/SingleServer
b/sql/test/BugTracker-2020/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
--- a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
+++ b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
@@ -5,7 +5,6 @@ try:
except ImportError:
import process
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
c1 = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
c2 = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
@@ -25,7 +24,3 @@ DROP TABLE "testVarcharToClob";
''')
sys.stdout.write(out)
sys.stderr.write(err)
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
--- a/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
+++ b/sql/test/BugTracker-2020/Tests/functions-not-persist.Bug-6819.py
@@ -1,13 +1,22 @@
-import sys
-
+import os, socket, sys, tempfile, shutil
try:
from MonetDBtesting import process
except ImportError:
import process
+def freeport():
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sock.bind(('', 0))
+ port = sock.getsockname()[1]
+ sock.close()
+ return port
+
+farm_dir = tempfile.mkdtemp()
+os.mkdir(os.path.join(farm_dir, 'db1'))
+myport = freeport()
def client(input):
- c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+ c = process.client('sql', port=myport, dbname='db1', stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
out, err = c.communicate(input)
sys.stdout.write(out)
sys.stderr.write(err)
@@ -45,10 +54,12 @@ DROP FUNCTION myfunc7;
server_args = ['--set', 'embedded_py=3', '--set', 'embedded_r=true', '--set',
'embedded_c=true']
-s = process.server(args = server_args, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
+s = process.server(args = server_args, mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
client(create + run)
server_stop(s)
-s = process.server(args = server_args, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
+s = process.server(args = server_args, mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
client(run + drop)
server_stop(s)
+
+shutil.rmtree(farm_dir)
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
+++ b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.SQL.py
@@ -13,18 +13,19 @@ def freeport():
farm_dir = tempfile.mkdtemp()
os.mkdir(os.path.join(farm_dir, 'db1'))
+myport = freeport()
def server_start(args):
sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
- srv = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ srv = process.server(mapiport=myport, dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
def client(lang, file):
sys.stderr.write('#client: "%s"\n' % file)
sys.stderr.flush()
- clt = process.client(lang.lower(), stdin = open(file),
+ clt = process.client(lang.lower(), port=myport, dbname='db1', stdin =
open(file),
stdout = process.PIPE, stderr = process.PIPE)
return clt.communicate()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
