Changeset: ba2bbd858031 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba2bbd858031
Added Files:
sql/test/BugTracker-2011/Tests/SingleServer
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
sql/test/BugTracker-2012/Tests/SingleServer
sql/test/BugTracker-2013/Tests/SingleServer
sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
sql/test/BugTracker-2014/Tests/SingleServer
Removed Files:
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
Branch: Nov2019
Log Message:
Added Single server runs for BugTrackers 2011, 2012, 2013 and 2014
diffs (124 lines):
diff --git a/sql/test/BugTracker-2011/Tests/SingleServer
b/sql/test/BugTracker-2011/Tests/SingleServer
new file mode 100644
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
rename from
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
rename to
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
--- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
+++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
@@ -1,36 +1,28 @@
from __future__ import print_function
-import os, sys
+import os, socket, sys, tempfile, shutil
try:
from MonetDBtesting import process
except ImportError:
import process
-dbfarm = os.getenv('GDK_DBFARM')
-tstdb = os.getenv('TSTDB')
-
-if not tstdb or not dbfarm:
- print('No TSTDB or GDK_DBFARM in environment')
- sys.exit(1)
-
-dbname = tstdb + '-bug2875'
+def freeport():
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sock.bind(('', 0))
+ port = sock.getsockname()[1]
+ sock.close()
+ return port
-# clean up before we start
-if os.path.exists(os.path.join(dbfarm, dbname)):
- import shutil
- shutil.rmtree(os.path.join(dbfarm, dbname))
+farm_dir = tempfile.mkdtemp()
+os.mkdir(os.path.join(farm_dir, 'db1'))
-s = process.server(stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE,
- dbname = dbname)
+s = process.server(mapiport=freeport(), 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(stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE,
- dbname = dbname)
+s = process.server(mapiport=freeport(), dbname='db1',
dbfarm=os.path.join(farm_dir, 'db1'), stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
c = process.client(lang = 'sqldump',
stdin = process.PIPE,
stdout = process.PIPE,
@@ -42,3 +34,5 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
+
+shutil.rmtree(farm_dir)
diff --git a/sql/test/BugTracker-2012/Tests/SingleServer
b/sql/test/BugTracker-2012/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugTracker-2013/Tests/SingleServer
b/sql/test/BugTracker-2013/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
rename from sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
rename to sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
--- a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.py
+++ b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
@@ -1,11 +1,21 @@
+import os, socket, sys, tempfile, shutil
try:
from MonetDBtesting import process
except ImportError:
import process
-import sys
+def freeport():
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sock.bind(('', 0))
+ port = sock.getsockname()[1]
+ sock.close()
+ return port
-s = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
+farm_dir = tempfile.mkdtemp()
+os.mkdir(os.path.join(farm_dir, 'db1'))
+
+s = process.server(mapiport=freeport(), 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)
out, err = c.communicate('''start transaction;
create table table3282 (i int);
@@ -39,7 +49,8 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
+s = process.server(mapiport=freeport(), 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)
out, err = c.communicate('''select * from table3282 offset 2097140;
''')
@@ -48,7 +59,8 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-s = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
+s = process.server(mapiport=freeport(), 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)
out, err = c.communicate('''select * from table3282 offset 2097140;
drop table table3282;
@@ -58,3 +70,5 @@ sys.stderr.write(err)
out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
+
+shutil.rmtree(farm_dir)
diff --git a/sql/test/BugTracker-2014/Tests/SingleServer
b/sql/test/BugTracker-2014/Tests/SingleServer
new file mode 100644
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
