Changeset: 308cf91c3671 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=308cf91c3671
Added Files:
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc100.stable.err
sql/test/wlcr/Tests/wlc100.stable.out
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr100.stable.err
sql/test/wlcr/Tests/wlr100.stable.out
sql/test/wlcr/Tests/wlr70.py
Removed Files:
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlc80.stable.err
sql/test/wlcr/Tests/wlc80.stable.out
sql/test/wlcr/Tests/wlr80.py
sql/test/wlcr/Tests/wlr80.stable.err
sql/test/wlcr/Tests/wlr80.stable.out
Modified Files:
sql/test/wlcr/Tests/All
Branch: wlcr
Log Message:
Approve output
diffs (143 lines):
diff --git a/sql/test/wlcr/Tests/All b/sql/test/wlcr/Tests/All
--- a/sql/test/wlcr/Tests/All
+++ b/sql/test/wlcr/Tests/All
@@ -16,18 +16,22 @@ wlr20
# prepare an update to the master
wlc30
-#
+
# roll forward to clone
wlr30
-#
-##delete some tupples
+
+#delete some tupples
wlc40
wlr40
-#
-##clear the complete table
+
+#clear the complete table
wlc50
wlr50
-#
-##stop the master
-wlc80
-wlr80
+
+# restart for timing based roll forward
+wlc70
+wlr70
+
+#stop the master
+wlc100
+wlr100
diff --git a/sql/test/wlcr/Tests/wlc80.py b/sql/test/wlcr/Tests/wlc100.py
rename from sql/test/wlcr/Tests/wlc80.py
rename to sql/test/wlcr/Tests/wlc100.py
diff --git a/sql/test/wlcr/Tests/wlc80.stable.err
b/sql/test/wlcr/Tests/wlc100.stable.err
rename from sql/test/wlcr/Tests/wlc80.stable.err
rename to sql/test/wlcr/Tests/wlc100.stable.err
diff --git a/sql/test/wlcr/Tests/wlc80.stable.out
b/sql/test/wlcr/Tests/wlc100.stable.out
rename from sql/test/wlcr/Tests/wlc80.stable.out
rename to sql/test/wlcr/Tests/wlc100.stable.out
diff --git a/sql/test/wlcr/Tests/wlc70.py b/sql/test/wlcr/Tests/wlc70.py
new file mode 100644
--- /dev/null
+++ b/sql/test/wlcr/Tests/wlc70.py
@@ -0,0 +1,34 @@
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+import os, sys
+
+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)
+
+#clean up first
+dbname = tstdb
+dbnameclone = tstdb + '-clone'
+
+s = process.server(dbname = dbname, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
+
+c = process.client('sql', dbname = dbname, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
+
+#continue logging
+cout, cerr = c.communicate('''\
+create table tmp2(i int, s string);
+insert into tmp2 values(1,'hello'), (2,'world');
+select * from tmp2;
+''')
+
+sout, serr = s.communicate()
+
+sys.stdout.write(sout)
+sys.stdout.write(cout)
+sys.stderr.write(serr)
+sys.stderr.write(cerr)
diff --git a/sql/test/wlcr/Tests/wlr80.py b/sql/test/wlcr/Tests/wlr100.py
rename from sql/test/wlcr/Tests/wlr80.py
rename to sql/test/wlcr/Tests/wlr100.py
diff --git a/sql/test/wlcr/Tests/wlr80.stable.err
b/sql/test/wlcr/Tests/wlr100.stable.err
rename from sql/test/wlcr/Tests/wlr80.stable.err
rename to sql/test/wlcr/Tests/wlr100.stable.err
diff --git a/sql/test/wlcr/Tests/wlr80.stable.out
b/sql/test/wlcr/Tests/wlr100.stable.out
rename from sql/test/wlcr/Tests/wlr80.stable.out
rename to sql/test/wlcr/Tests/wlr100.stable.out
diff --git a/sql/test/wlcr/Tests/wlr70.py b/sql/test/wlcr/Tests/wlr70.py
new file mode 100644
--- /dev/null
+++ b/sql/test/wlcr/Tests/wlr70.py
@@ -0,0 +1,46 @@
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+import os, sys, socket
+
+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)
+
+def freeport():
+ sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ sock.bind(('', 0))
+ port = sock.getsockname()[1]
+ sock.close()
+ return port
+
+cloneport = freeport()
+
+dbname = tstdb
+dbnameclone = tstdb + '-clone'
+
+#master = process.server(dbname = dbname, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
+slave = process.server(dbname = dbnameclone, mapiport = cloneport, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+
+c = process.client('sql', dbname = dbnameclone, port = cloneport, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+
+cout, cerr = c.communicate('''\
+call replicate('%s', now());
+select * from tmp;
+call replicate('%s', now());
+select * from tmp;
+''' % (dbname,dbname))
+
+sout, serr = slave.communicate()
+#mout, merr = master.communicate()
+
+#sys.stdout.write(mout)
+sys.stdout.write(sout)
+sys.stdout.write(cout)
+#sys.stderr.write(merr)
+sys.stderr.write(serr)
+sys.stderr.write(cerr)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
