Changeset: 0c26a72321d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c26a72321d6
Added Files:
sql/test/ADT2006/Tests/SingleServer
sql/test/BugConstraints/Tests/SingleServer
sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer
sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer
sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer
sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer
sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer
sql/test/LSST/Tests/SingleServer
sql/test/Skyserver/Tests/SingleServer
sql/test/Update_Delete_action/Tests/SingleServer
sql/test/Via-m/Tests/SingleServer
sql/test/broken_delete/Tests/SingleServer
sql/test/in-value-list/Tests/SingleServer
sql/test/lateral/Tests/SingleServer
sql/test/mapi/Tests/SingleServer
sql/test/merge-statements/Tests/SingleServer
sql/test/mergetables/Tests/SingleServer
sql/test/miscellaneous/Tests/SingleServer
sql/test/null/Tests/SingleServer
sql/test/orderidx/Tests/SingleServer
sql/test/osm/Tests/SingleServer
sql/test/quantiles/Tests/SingleServer
sql/test/rdf/Tests/SingleServer
sql/test/snodgrass/Tests/SingleServer
sql/test/xquery/Tests/SingleServer
Modified Files:
sql/test/mergetables/Tests/transaction-conflict.py
sql/test/miscellaneous/Tests/pk_fk_stress.py
sql/test/orderidx/Tests/oidx_all_types.sql
sql/test/orderidx/Tests/oidx_hge_type.sql
Branch: Nov2019
Log Message:
More single server runs
diffs (135 lines):
diff --git a/sql/test/ADT2006/Tests/SingleServer
b/sql/test/ADT2006/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugConstraints/Tests/SingleServer
b/sql/test/BugConstraints/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer
b/sql/test/BugDay_2005-10-06_2.8/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer
b/sql/test/BugDay_2005-11-09_2.8/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/LSST/Tests/SingleServer b/sql/test/LSST/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/Skyserver/Tests/SingleServer
b/sql/test/Skyserver/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/Update_Delete_action/Tests/SingleServer
b/sql/test/Update_Delete_action/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/Via-m/Tests/SingleServer
b/sql/test/Via-m/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/broken_delete/Tests/SingleServer
b/sql/test/broken_delete/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/in-value-list/Tests/SingleServer
b/sql/test/in-value-list/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/lateral/Tests/SingleServer
b/sql/test/lateral/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/mapi/Tests/SingleServer b/sql/test/mapi/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/merge-statements/Tests/SingleServer
b/sql/test/merge-statements/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/mergetables/Tests/SingleServer
b/sql/test/mergetables/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/mergetables/Tests/transaction-conflict.py
b/sql/test/mergetables/Tests/transaction-conflict.py
--- a/sql/test/mergetables/Tests/transaction-conflict.py
+++ b/sql/test/mergetables/Tests/transaction-conflict.py
@@ -1,12 +1,4 @@
-import os
-import sys
-import threading
-import pymonetdb
-
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
+import os, sys, threading, pymonetdb
"""
Attempt to modify a merge table in a conflicting transaction. After the
rollback, the table's contents must be cleaned
@@ -31,7 +23,6 @@ class MergeTableWriter(threading.Thread)
self._wcursor.execute('ROLLBACK;')
i += 1
-server = process.server(stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
conn = pymonetdb.connect(port = int(os.getenv('MAPIPORT', '50000')), database
= os.getenv('TSTDB', 'demo'), hostname = os.getenv('MAPIHOST', 'localhost'),
autocommit=True)
cursor = conn.cursor()
barrier1 = threading.Barrier(2)
@@ -68,7 +59,3 @@ DROP TABLE "mt";
DROP TABLE "part";
COMMIT;
""")
-
-sout, serr = server.communicate()
-sys.stdout.write(sout)
-sys.stderr.write(serr)
diff --git a/sql/test/miscellaneous/Tests/SingleServer
b/sql/test/miscellaneous/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/miscellaneous/Tests/pk_fk_stress.py
b/sql/test/miscellaneous/Tests/pk_fk_stress.py
--- a/sql/test/miscellaneous/Tests/pk_fk_stress.py
+++ b/sql/test/miscellaneous/Tests/pk_fk_stress.py
@@ -2,13 +2,6 @@ from __future__ import print_function
import pymonetdb, sys, threading, os
-try:
- from MonetDBtesting import process
-except ImportError:
- import process
-
-
-s = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
client1 = pymonetdb.connect(port = int(os.getenv('MAPIPORT', '50000')),
database = os.getenv('TSTDB', 'demo'), hostname = os.getenv('MAPIHOST',
'localhost'), autocommit=True)
client2 = pymonetdb.connect(port = int(os.getenv('MAPIPORT', '50000')),
database = os.getenv('TSTDB', 'demo'), hostname = os.getenv('MAPIHOST',
'localhost'), autocommit=True)
cursor1 = client1.cursor()
@@ -115,7 +108,3 @@ cursor1.close()
cursor2.close()
client1.close()
client2.close()
-
-out, err = s.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/null/Tests/SingleServer b/sql/test/null/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/orderidx/Tests/SingleServer
b/sql/test/orderidx/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/orderidx/Tests/oidx_all_types.sql
b/sql/test/orderidx/Tests/oidx_all_types.sql
--- a/sql/test/orderidx/Tests/oidx_all_types.sql
+++ b/sql/test/orderidx/Tests/oidx_all_types.sql
@@ -1,3 +1,4 @@
+start transaction;
SET TIME ZONE INTERVAL '+01:00' HOUR TO MINUTE;
-- first create a table for all basic data types and fill it with some data
rows (including duplicate rows)
@@ -338,3 +339,4 @@ drop table if exists all_types cascade;
select type, name from sys.idxs where table_id in (select id from sys._tables
where name = 'all_types') order by name;
+rollback;
diff --git a/sql/test/orderidx/Tests/oidx_hge_type.sql
b/sql/test/orderidx/Tests/oidx_hge_type.sql
--- a/sql/test/orderidx/Tests/oidx_hge_type.sql
+++ b/sql/test/orderidx/Tests/oidx_hge_type.sql
@@ -1,3 +1,4 @@
+start transaction;
create table hge_types (
"hugeint" hugeint,
"decimal" decimal, -- is synonym for decimal(18,3)
@@ -92,4 +93,4 @@ drop table hge_types;
drop table if exists hge_types cascade;
select type, name from sys.idxs where table_id in (select id from sys._tables
where name = 'hge_types') order by name;
-
+rollback;
diff --git a/sql/test/osm/Tests/SingleServer b/sql/test/osm/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/quantiles/Tests/SingleServer
b/sql/test/quantiles/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/rdf/Tests/SingleServer b/sql/test/rdf/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/snodgrass/Tests/SingleServer
b/sql/test/snodgrass/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/xquery/Tests/SingleServer
b/sql/test/xquery/Tests/SingleServer
new file mode 100644
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
