Changeset: cdc97532d364 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdc97532d364
Added Files:
sql/test/BugTracker-2015/Tests/SingleServer
sql/test/BugTracker-2016/Tests/SingleServer
sql/test/BugTracker-2017/Tests/SingleServer
sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
sql/test/BugTracker-2018/Tests/SingleServer
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
Removed Files:
sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py
Branch: Nov2019
Log Message:
Added single server runs for BugTrackers 2015, 2016, 2017 and 2018
diffs (74 lines):
diff --git a/sql/test/BugTracker-2015/Tests/SingleServer
b/sql/test/BugTracker-2015/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugTracker-2016/Tests/SingleServer
b/sql/test/BugTracker-2016/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugTracker-2017/Tests/SingleServer
b/sql/test/BugTracker-2017/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/SingleServer
@@ -0,0 +1,1 @@
+--set embedded_py=2
diff --git a/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql
b/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
rename from sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql
rename to sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
--- a/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.sql
+++ b/sql/test/BugTracker-2017/Tests/shutdown.Bug-6182.SQL.py
@@ -1,1 +1,30 @@
-call sys.shutdown(10);
+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()
+
+srv = 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', port=myport, dbname='db1', stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
+out, err = c.communicate('call sys.shutdown(10);')
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+shutil.rmtree(farm_dir)
diff --git a/sql/test/BugTracker-2018/Tests/SingleServer
b/sql/test/BugTracker-2018/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/SingleServer
@@ -0,0 +1,1 @@
+--set embedded_py=2
diff --git
a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py
b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
rename from sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py
rename to
sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
--- a/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py
+++ b/sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.SQL.py
@@ -42,15 +42,11 @@ drop user "mydummyuser";
def main():
- s = process.server(stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
client(script1, 'monetdb', 'monetdb')
client(script2, 'mydummyuser', 'mydummyuser')
client(script3, 'monetdb', 'monetdb')
client(script4, 'mydummyuser', 'mydummyuser')
client(script5, 'monetdb', 'monetdb')
- out, err = s.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
if __name__ == '__main__':
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
