Changeset: cb476a1dec2f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb476a1dec2f
Modified Files:
sql/test/sysmon/Tests/sys_queue_expand.SQL.py
sql/test/sysmon/Tests/sys_queue_expand.stable.out
sql/test/sysmon/Tests/sys_user_statistics.SQL.py
sql/test/sysmon/Tests/sys_user_statistics.stable.out
Branch: userstats
Log Message:
minor fixes in test and stable.out after merge
diffs (70 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
@@ -11,7 +11,7 @@ def exec_query():
dbh = pymonetdb.connect(database = os.environ['TSTDB'], port =
int(os.environ['MAPIPORT']), hostname = os.environ['MAPIHOST'], autocommit=True)
#dbh = pymonetdb.connect(database = 'demo', autocommit=True)
cur = dbh.cursor()
- cur.execute('call sleep(3000)')
+ cur.execute('call sys.sleep(3000)')
except pymonetdb.exceptions.Error as e:
print(e)
finally:
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
@@ -11,15 +11,15 @@ Before sleep: 3
('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', 'call sleep(3000)\n;')
+('during', 'monetdb', 'running', 'call sys.sleep(3000)\n;')
+('during', 'monetdb', 'running', 'call sys.sleep(3000)\n;')
+('during', 'monetdb', 'running', 'call sys.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', 'call sleep(3000)\n;')
+('after', 'monetdb', 'finished', 'call sys.sleep(3000)\n;')
+('after', 'monetdb', 'finished', 'call sys.sleep(3000)\n;')
+('after', 'monetdb', 'finished', 'call sys.sleep(3000)\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;")
diff --git a/sql/test/sysmon/Tests/sys_user_statistics.SQL.py
b/sql/test/sysmon/Tests/sys_user_statistics.SQL.py
--- a/sql/test/sysmon/Tests/sys_user_statistics.SQL.py
+++ b/sql/test/sysmon/Tests/sys_user_statistics.SQL.py
@@ -5,7 +5,6 @@ users = ['user1', 'user2', 'user3', 'use
try:
mdbdbh = pymonetdb.connect(database = os.environ['TSTDB'], port =
int(os.environ['MAPIPORT']), hostname = os.environ['MAPIHOST'], autocommit=True)
mdbcursor = mdbdbh.cursor()
- rowcnt = mdbcursor.execute('create procedure sleep(i int) external name
alarm.sleep')
rowcnt = mdbcursor.execute('call sys.sleep(200)')
rowcnt = mdbcursor.execute('select querycount from sys.user_statistics()
where username = \'monetdb\'')
mdbqrycnt = mdbcursor.fetchone()[0]
@@ -44,9 +43,5 @@ finally:
mdbcursor.execute('drop user {usr}'.format(usr=usr))
except pymonetdb.exceptions.Error as e:
print(e)
- try:
- mdbcursor.execute('drop procedure sleep')
- except pymonetdb.exceptions.Error as e:
- print(e)
mdbdbh.close()
diff --git a/sql/test/sysmon/Tests/sys_user_statistics.stable.out
b/sql/test/sysmon/Tests/sys_user_statistics.stable.out
--- a/sql/test/sysmon/Tests/sys_user_statistics.stable.out
+++ b/sql/test/sysmon/Tests/sys_user_statistics.stable.out
@@ -6,7 +6,7 @@ stdout of test 'sys_user_statistics` in
# 14:56:33 >
User statistics after: 8
-('monetdb', 15, 'call sys.sleep(200)\n;')
+('monetdb', 15, 'call sys.sleep(3000)\n;')
('user1', 2, 'call sys.sleep(200)\n;')
('user2', 2, 'call sys.sleep(200)\n;')
('user3', 2, 'call sys.sleep(200)\n;')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
