Changeset: 0172ae6afb91 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0172ae6afb91
Modified Files:
sql/test/transactions/Tests/transaction_isolation3.SQL.py
sql/test/transactions/Tests/transaction_isolation4.SQL.py
sql/test/transactions/Tests/transaction_isolation5.SQL.py
Branch: Jan2022
Log Message:
Don't assert too much
diffs (83 lines):
diff --git a/sql/test/transactions/Tests/transaction_isolation3.SQL.py
b/sql/test/transactions/Tests/transaction_isolation3.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation3.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation3.SQL.py
@@ -71,7 +71,7 @@ with SQLTestCase() as mdb1:
mdb2.execute("alter table x drop column y;").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select * from
myv;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,1)])
+ mdb1.execute('select * from
myv;').assertSucceeded().assertDataResultMatch([(1,1)])
mdb1.execute("create table ups.no (a int, b int);").assertSucceeded()
mdb1.execute('insert into ups.no values (2, 2);').assertSucceeded()
@@ -81,7 +81,7 @@ with SQLTestCase() as mdb1:
mdb2.execute("alter table ups.no drop column a;").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select * from
another();').assertSucceeded().assertSucceeded().assertDataResultMatch([(2,)])
+ mdb1.execute('select * from
another();').assertSucceeded().assertDataResultMatch([(2,)])
mdb1.execute("CREATE TABLE y (i int);").assertSucceeded()
mdb1.execute('CREATE TABLE integers2 (i int, j
int);').assertSucceeded()
@@ -101,7 +101,7 @@ with SQLTestCase() as mdb1:
mdb2.execute("drop function pain();").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select * from
myv2;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,)])
+ mdb1.execute('select * from
myv2;').assertSucceeded().assertDataResultMatch([(1,)])
mdb1.execute("CREATE TABLE longs (i bigint);").assertSucceeded()
mdb1.execute('start transaction;').assertSucceeded()
@@ -111,7 +111,7 @@ with SQLTestCase() as mdb1:
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
mdb1.execute('insert into integers values (4,4);').assertSucceeded()
- mdb1.execute('select * from
longs;').assertSucceeded().assertSucceeded().assertDataResultMatch([(16,)])
+ mdb1.execute('select * from
longs;').assertSucceeded().assertDataResultMatch([(16,)])
mdb1.execute("create table z (i int);").assertSucceeded()
mdb1.execute('start transaction;').assertSucceeded()
@@ -137,7 +137,7 @@ with SQLTestCase() as mdb1:
mdb2.execute("alter table ww rename column y to yy;").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select * from
myv4;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,1)])
+ mdb1.execute('select * from
myv4;').assertSucceeded().assertDataResultMatch([(1,1)])
mdb1.execute('create table bbb(y int, z int);').assertSucceeded()
mdb1.execute('insert into bbb values (1, 1);').assertSucceeded()
@@ -156,7 +156,7 @@ with SQLTestCase() as mdb1:
mdb2.execute("alter table zz set schema ups;").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select * from
myv5;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,1)])
+ mdb1.execute('select * from
myv5;').assertSucceeded().assertDataResultMatch([(1,1)])
mdb1.execute('create table xx(y int, z int);').assertSucceeded()
mdb1.execute('insert into xx values (1, 1);').assertSucceeded()
diff --git a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation4.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation4.SQL.py
@@ -148,8 +148,8 @@ with SQLTestCase() as mdb1:
mdb2.execute('commit and chain;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
# At the moment while chaining, if the finishing transaction has
conflcts, the new transaction won't start
mdb2.execute('commit;').assertFailed(err_code="2DM30",
err_message="COMMIT: not allowed in auto commit mode")
- mdb1.execute('SELECT i from
integers;').assertSucceeded().assertSucceeded().assertDataResultMatch([])
- mdb2.execute('SELECT i from
integers;').assertSucceeded().assertSucceeded().assertDataResultMatch([])
+ mdb1.execute('SELECT i from
integers;').assertSucceeded().assertDataResultMatch([])
+ mdb2.execute('SELECT i from
integers;').assertSucceeded().assertDataResultMatch([])
mdb1.execute('start transaction;').assertSucceeded()
mdb1.execute('drop table myt;').assertSucceeded()
diff --git a/sql/test/transactions/Tests/transaction_isolation5.SQL.py
b/sql/test/transactions/Tests/transaction_isolation5.SQL.py
--- a/sql/test/transactions/Tests/transaction_isolation5.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation5.SQL.py
@@ -212,6 +212,6 @@ with SQLTestCase() as mdb1:
mdb2.execute("insert into t0 values (4),(5),(6);").assertSucceeded()
mdb1.execute('commit;').assertSucceeded()
mdb2.execute('commit;').assertFailed(err_code="40001",
err_message="COMMIT: transaction is aborted because of concurrency conflicts,
will ROLLBACK instead")
- mdb1.execute('select c0 from
t0;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,),(2,),(3,)])
- mdb2.execute('select c0 from
t0;').assertSucceeded().assertSucceeded().assertDataResultMatch([(1,),(2,),(3,)])
+ mdb1.execute('select c0 from
t0;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,)])
+ mdb2.execute('select c0 from
t0;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,)])
mdb1.execute('drop table t0;').assertSucceeded()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
