diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
tree | 6a637dd4dde653f870346a37ec6555eb0574949a /test/capi3.test | |
parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'test/capi3.test')
-rw-r--r-- | test/capi3.test | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/capi3.test b/test/capi3.test index d910626..9d7434d 100644 --- a/test/capi3.test +++ b/test/capi3.test @@ -649,13 +649,18 @@ do_test capi3-6.1 { db cache flush sqlite3_close $DB } {SQLITE_BUSY} + +# 6.2 and 6.3 used to return SQLITE_ERROR and SQLITE_SCHEMA, respectively. +# But since attempting to close a connection no longer resets the internal +# schema and expires all statements, this is no longer the case. do_test capi3-6.2 { sqlite3_step $STMT -} {SQLITE_ERROR} +} {SQLITE_ROW} #check_data $STMT capi3-6.3 {INTEGER} {1} {1.0} {1} do_test capi3-6.3 { sqlite3_finalize $STMT -} {SQLITE_SCHEMA} +} {SQLITE_OK} + do_test capi3-6.4-misuse { db cache flush sqlite3_close $DB @@ -778,6 +783,7 @@ foreach {code english} $code2english { } # Test the error message when a "real" out of memory occurs. +if { [permutation] != "nofaultsim" } { ifcapable memdebug { do_test capi3-10-1 { sqlite3 db test.db @@ -816,6 +822,7 @@ ifcapable memdebug { db close sqlite3_memdebug_fail -1 } +} # The following tests - capi3-11.* - test that a COMMIT or ROLLBACK # statement issued while there are still outstanding VMs that are part of |