Changeset: e0a6dfa4a62a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0a6dfa4a62a
Modified Files:
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
Branch: Jun2016
Log Message:
Catch exception and properly stop processes.
This reduces the amount of variable output.
diffs (61 lines):
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
@@ -88,9 +88,16 @@ try:
c.execute(rtable)
c.execute(atable)
- c.execute("select * from " + shardtable + workers[0]['tpf'] )
- print str(c.fetchall())
+ try:
+ c.execute("select * from " + shardtable + workers[0]['tpf'] )
+ except monetdb.sql.OperationalError as e:
+ print(e)
+ else:
+ print(str(c.fetchall()))
finally:
+ masterproc.communicate()
+ for worker in workers:
+ workerrec['proc'].communicate()
if os.path.exists(tmpdir):
shutil.rmtree(tmpdir)
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
@@ -66,21 +66,8 @@ stderr of test 'schemadiff.Bug-3778` in
# cmdline opt mapi_port = 48845
# cmdline opt gdk_dbpath = /tmp/tmpou_du0/worker_0/worker_0
# cmdline opt gdk_debug = 536870922
-Traceback (most recent call last):
- File "schemadiff.Bug-3778.SQL.py", line 85, in <module>
- c.execute("select * from " + shardtable + workers[0]['tpf'] )
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/cursors.py",
line 158, in execute
- block = self.connection.execute(query)
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 127, in execute
- return self.command('s' + query + '\n;')
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 132, in command
- return self.mapi.cmd(command)
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/mapi.py",
line 178, in cmd
- raise OperationalError(response[1:])
-monetdb.exceptions.OperationalError:
(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in:
rmt5_X_1_bat_oid_int:bat[:oid,:int] := user.l1();
-!failed to open file: No such file or directory
(/tmp/tmpou_du0/worker_0/worker_0/.uplog)!failed to open file: No such file or
directory (/tmp/tmpou_du0/master/master/.uplog)
-# 12:53:25 >
-# 12:53:25 > "Done."
-# 12:53:25 >
+# 11:56:09 >
+# 11:56:09 > "Done."
+# 11:56:09 >
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
@@ -27,6 +27,7 @@ Ready.
# 15:29:05 > "/usr/bin/python2" "schemadiff.Bug-3778.SQL.py"
"schemadiff.Bug-3778"
# 15:29:05 >
+(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in:
rmt5_X_1_bat_int:bat[:int] := user.l1();
# 15:29:06 >
# 15:29:06 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
