Changeset: 26aa31895953 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26aa31895953
Added Files:
sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src
sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py.src
sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py.src
sql/test/emptydb-upgrade/Tests/dump.SQL.py.src
sql/test/emptydb/Tests/dump.SQL.py
sql/test/emptydb/Tests/load.test
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/emptydb-upgrade/Tests/dump.stable.out
sql/test/emptydb/Tests/dump.stable.out
Branch: mtest
Log Message:
Convert some of the complex tests.
diffs (140 lines):
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src
b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/dump.SQL.py
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128
@@ -28,10 +28,7 @@ stdout of test 'dump` in directory 'sql/
# 16:42:40 > "/usr/bin/python2" "dump.SQL.py" "dump"
# 16:42:40 >
-START TRANSACTION;
-COMMIT;
+# 17:29:11 >
+# 17:29:11 > "Done."
+# 17:29:11 >
-# 16:42:41 >
-# 16:42:41 > "Done."
-# 16:42:41 >
-
diff --git a/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py.src
b/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/dump.SQL.py
diff --git a/sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
@@ -28,10 +28,7 @@ stdout of test 'dump` in directory 'sql/
# 16:42:35 > "/usr/bin/python2" "dump.SQL.py" "dump"
# 16:42:35 >
-START TRANSACTION;
-COMMIT;
+# 17:28:59 >
+# 17:28:59 > "Done."
+# 17:28:59 >
-# 16:42:35 >
-# 16:42:35 > "Done."
-# 16:42:35 >
-
diff --git a/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py.src
b/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/dump.SQL.py
diff --git a/sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128
@@ -28,10 +28,7 @@ stdout of test 'dump` in directory 'sql/
# 16:42:46 > "/usr/bin/python2" "dump.SQL.py" "dump"
# 16:42:46 >
-START TRANSACTION;
-COMMIT;
+# 17:29:23 >
+# 17:29:23 > "Done."
+# 17:29:23 >
-# 16:42:46 >
-# 16:42:46 > "Done."
-# 16:42:46 >
-
diff --git a/sql/test/emptydb-upgrade/Tests/dump.SQL.py.src
b/sql/test/emptydb-upgrade/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-upgrade/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/dump.SQL.py
diff --git a/sql/test/emptydb-upgrade/Tests/dump.stable.out
b/sql/test/emptydb-upgrade/Tests/dump.stable.out
--- a/sql/test/emptydb-upgrade/Tests/dump.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/dump.stable.out
@@ -28,10 +28,7 @@ stdout of test 'dump` in directory 'sql/
# 16:42:30 > "/usr/bin/python2" "dump.SQL.py" "dump"
# 16:42:30 >
-START TRANSACTION;
-COMMIT;
+# 17:28:49 >
+# 17:28:49 > "Done."
+# 17:28:49 >
-# 16:42:30 >
-# 16:42:30 > "Done."
-# 16:42:30 >
-
diff --git a/sql/test/emptydb/Tests/dump.SQL.py
b/sql/test/emptydb/Tests/dump.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb/Tests/dump.SQL.py
@@ -0,0 +1,16 @@
+import os, sys, re
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+with process.client('sqldump', stdout=process.PIPE, stderr=process.PIPE) as c:
+ out, err = c.communicate()
+
+for line in out.split('\n'):
+ if line.startswith('--') or not line:
+ continue
+ if line != 'START TRANSACTION;' and line != 'COMMIT;':
+ # unexpected output, dump it all
+ print(out)
+ break
diff --git a/sql/test/emptydb/Tests/dump.stable.out
b/sql/test/emptydb/Tests/dump.stable.out
--- a/sql/test/emptydb/Tests/dump.stable.out
+++ b/sql/test/emptydb/Tests/dump.stable.out
@@ -28,10 +28,7 @@ stdout of test 'dump` in directory 'sql/
# 14:10:23 > "/usr/bin/python2" "dump.SQL.py" "dump"
# 14:10:23 >
-START TRANSACTION;
-COMMIT;
+# 17:22:58 >
+# 17:22:58 > "Done."
+# 17:22:58 >
-# 14:10:24 >
-# 14:10:24 > "Done."
-# 14:10:24 >
-
diff --git a/sql/test/emptydb/Tests/load.test b/sql/test/emptydb/Tests/load.test
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb/Tests/load.test
@@ -0,0 +1,5 @@
+query I nosort
+select 1
+----
+1
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
