Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: third_party/sqlite/src/test/shared_err.test

Issue 949043002: Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/test/sharedB.test ('k') | third_party/sqlite/src/test/sharedlock.test » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/test/shared_err.test
diff --git a/third_party/sqlite/src/test/shared_err.test b/third_party/sqlite/src/test/shared_err.test
index f501fc70d9daa047675bc79e989978ad0d8771f2..96e5ee454090a0ad372ebf104287c9e355d3829a 100644
--- a/third_party/sqlite/src/test/shared_err.test
+++ b/third_party/sqlite/src/test/shared_err.test
@@ -401,6 +401,8 @@ do_malloc_test shared_err-8 -tclprep {
execsql {INSERT INTO t1 VALUES($a, $b)} db2
}
execsql {COMMIT} db2
+ execsql BEGIN
+ execsql ROLLBACK
set ::DB2 [sqlite3_connection_pointer db2]
set ::STMT [sqlite3_prepare $::DB2 "SELECT a FROM t1 ORDER BY a" -1 DUMMY]
sqlite3_step $::STMT ;# Cursor points at 0000000000
@@ -409,8 +411,7 @@ do_malloc_test shared_err-8 -tclprep {
execsql {
BEGIN;
INSERT INTO t1 VALUES(6, NULL);
- ROLLBACK;
- }
+ ROLLBACK}
} -cleanup {
# UPDATE: As of [5668], if the rollback fails SQLITE_CORRUPT is returned.
# So these tests have been updated to expect SQLITE_CORRUPT and its
@@ -445,9 +446,15 @@ do_malloc_test shared_err-8 -tclprep {
} {1}
db2 close
}
+
+# When this test case was written, OOM errors in write statements would
+# cause transaction rollback, which would trip cursors in other statements,
+# aborting them. This no longer happens.
+#
do_test shared_malloc-8.X {
# Test that one or more queries were aborted due to the malloc() failure.
- expr $::aborted>=1
+ # expr $::aborted>=1
+ expr $::aborted==0
} {1}
# This test is designed to catch a specific bug that was present during
« no previous file with comments | « third_party/sqlite/src/test/sharedB.test ('k') | third_party/sqlite/src/test/sharedlock.test » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698