Changeset: 08532def6657 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08532def6657 Modified Files: sql/test/sysmon/Tests/sys_queue_expand.SQL.py sql/test/sysmon/Tests/sys_queue_expand.stable.out Branch: default Log Message:
Make the query output a bit more deterministic diffs (57 lines): diff --git a/sql/test/sysmon/Tests/sys_queue_expand.SQL.py b/sql/test/sysmon/Tests/sys_queue_expand.SQL.py --- a/sql/test/sysmon/Tests/sys_queue_expand.SQL.py +++ b/sql/test/sysmon/Tests/sys_queue_expand.SQL.py @@ -25,7 +25,7 @@ try: #mstdbh = pymonetdb.connect(database = 'demo', autocommit=True) mstcur = mstdbh.cursor() - rowcnt = mstcur.execute('select \'before\', username,status,query from sys.queue()') + rowcnt = mstcur.execute('select \'before\', username,status,query from sys.queue() order by status, query') print("Before sleep: {no}".format(no=rowcnt)) [print(row) for row in mstcur.fetchall()] @@ -35,14 +35,14 @@ try: [p.start() for p in jobs] time.sleep(1) - rowcnt = mstcur.execute('select \'during\', username,status,query from sys.queue()') + rowcnt = mstcur.execute('select \'during\', username,status,query from sys.queue() order by status, query') print("\nDuring sleep: {no}".format(no=rowcnt)) [print(row) for row in mstcur.fetchall()] # Exit the completed processes [p.join() for p in jobs] - rowcnt = mstcur.execute('select \'after\', username,status,query from sys.queue()') + rowcnt = mstcur.execute('select \'after\', username,status,query from sys.queue() order by status, query') print("\nAfter sleep: {no}".format(no=rowcnt)) [print(row) for row in mstcur.fetchall()] diff --git a/sql/test/sysmon/Tests/sys_queue_expand.stable.out b/sql/test/sysmon/Tests/sys_queue_expand.stable.out --- a/sql/test/sysmon/Tests/sys_queue_expand.stable.out +++ b/sql/test/sysmon/Tests/sys_queue_expand.stable.out @@ -8,20 +8,20 @@ stdout of test 'sys_queue_expand` in dir Before sleep: 3 ('before', 'monetdb', 'finished', 'select 5, username, status, query from sys.queue();') ('before', 'monetdb', 'finished', 'select 6, username, status, query from sys.queue();') -('before', 'monetdb', 'running', "select \\'before\\', username,status,query from sys.queue()\n;") +('before', 'monetdb', 'running', "select \\'before\\', username,status,query from sys.queue() order by status, query\n;") During sleep: 4 ('during', 'monetdb', 'running', 'call sleep(3000)\n;') ('during', 'monetdb', 'running', 'call sleep(3000)\n;') -('during', 'monetdb', 'running', "select \\'during\\', username,status,query from sys.queue()\n;") ('during', 'monetdb', 'running', 'call sleep(3000)\n;') +('during', 'monetdb', 'running', "select \\'during\\', username,status,query from sys.queue() order by status, query\n;") After sleep: 5 ('after', 'monetdb', 'finished', 'call sleep(3000)\n;') ('after', 'monetdb', 'finished', 'call sleep(3000)\n;') -('after', 'monetdb', 'finished', "select \\'during\\', username,status,query from sys.queue()\n;") ('after', 'monetdb', 'finished', 'call sleep(3000)\n;') -('after', 'monetdb', 'running', "select \\'after\\', username,status,query from sys.queue()\n;") +('after', 'monetdb', 'finished', "select \\'during\\', username,status,query from sys.queue() order by status, query\n;") +('after', 'monetdb', 'running', "select \\'after\\', username,status,query from sys.queue() order by status, query\n;") # 16:54:22 > # 16:54:22 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list