Changeset: bfa8ca1a8cb9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bfa8ca1a8cb9
Modified Files:
sql/test/sysmon/Tests/sys_pause_resume_stop.SQL.py
sql/test/sysmon/Tests/sys_queue_multisessions.SQL.py
Branch: default
Log Message:
Fix sys_pause_resume_stop test.
MacOS requires if name main syntax to properly distinguish parent/child procs.
diffs (80 lines):
diff --git a/sql/test/sysmon/Tests/sys_pause_resume_stop.SQL.py
b/sql/test/sysmon/Tests/sys_pause_resume_stop.SQL.py
--- a/sql/test/sysmon/Tests/sys_pause_resume_stop.SQL.py
+++ b/sql/test/sysmon/Tests/sys_pause_resume_stop.SQL.py
@@ -58,35 +58,33 @@ def execute_qry():
print(e)
exit(1)
-with SQLTestCase() as mdb:
- mdb.connect(username="monetdb", password="monetdb")
- mdb.execute(init).assertSucceeded()
- mdb.execute(p_proced).assertSucceeded()
- mdb.execute(r_proced).assertSucceeded()
- mdb.execute(s_proced).assertSucceeded()
+if __name__ == '__main__':
+ with SQLTestCase() as mdb:
+ mdb.connect(username="monetdb", password="monetdb")
+ mdb.execute(init).assertSucceeded()
+ mdb.execute(p_proced).assertSucceeded()
+ mdb.execute(r_proced).assertSucceeded()
+ mdb.execute(s_proced).assertSucceeded()
- client_proc1 = mp.Process(target=execute_qry)
- client_proc1.start()
-
- time.sleep(1)
- mdb.execute('call pause_sleep();').assertSucceeded()
- mdb.execute(status).assertSucceeded().assertDataResultMatch([('paused',)])
- mdb.execute('call resume_sleep();').assertSucceeded()
+ client_proc1 = mp.Process(target=execute_qry)
+ client_proc1.start()
- client_proc1.join()
-
- client_proc2 = mp.Process(target=execute_qry)
- client_proc2.start()
-
- time.sleep(1)
- mdb.execute('call stop_sleep();').assertSucceeded()
-
mdb.execute(status).assertSucceeded().assertDataResultMatch([('finished',)])
+ time.sleep(1)
+ mdb.execute('call pause_sleep();').assertSucceeded()
+
mdb.execute(status).assertSucceeded().assertDataResultMatch([('paused',)])
+ mdb.execute('call resume_sleep();').assertSucceeded()
+ client_proc1.join()
- client_proc2.join()
+ client_proc2 = mp.Process(target=execute_qry)
+ client_proc2.start()
+ time.sleep(1)
+ mdb.execute('call stop_sleep();').assertSucceeded()
+
mdb.execute(status).assertSucceeded().assertDataResultMatch([('finished',)])
+ client_proc2.join()
- mdb.execute('drop function sleep;').assertSucceeded()
- mdb.execute('drop procedure pause_sleep;').assertSucceeded()
- mdb.execute('drop procedure resume_sleep;').assertSucceeded()
- mdb.execute('drop procedure stop_sleep;').assertSucceeded()
- mdb.execute('drop user u1;').assertSucceeded()
- mdb.execute('drop schema s1;').assertSucceeded()
+ mdb.execute('drop function sleep;').assertSucceeded()
+ mdb.execute('drop procedure pause_sleep;').assertSucceeded()
+ mdb.execute('drop procedure resume_sleep;').assertSucceeded()
+ mdb.execute('drop procedure stop_sleep;').assertSucceeded()
+ mdb.execute('drop user u1;').assertSucceeded()
+ mdb.execute('drop schema s1;').assertSucceeded()
diff --git a/sql/test/sysmon/Tests/sys_queue_multisessions.SQL.py
b/sql/test/sysmon/Tests/sys_queue_multisessions.SQL.py
--- a/sql/test/sysmon/Tests/sys_queue_multisessions.SQL.py
+++ b/sql/test/sysmon/Tests/sys_queue_multisessions.SQL.py
@@ -42,7 +42,7 @@ with SQLTestCase() as mdb:
mdb.execute('select username, sessionid from sys.queue(\'ALL\')
group by username, sessionid order by sessionid;')\
.assertSucceeded().assertDataResultMatch([('monetdb', 0),
('u1', 1), ('u2', 2)])
- mdb.execute('drop user u1').assertSucceeded()
- mdb.execute('drop user u2').assertSucceeded()
- mdb.execute('drop role r1').assertSucceeded()
- mdb.execute('drop schema s1').assertSucceeded()
+ mdb.execute('drop user u1;').assertSucceeded()
+ mdb.execute('drop user u2;').assertSucceeded()
+ mdb.execute('drop role r1;').assertSucceeded()
+ mdb.execute('drop schema s1;').assertSucceeded()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
