/ Check-in [4e996f36]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Changes to oserror.test and syscall.test so that they work with the in-memory journal permutation test.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4e996f36c73c5e768a954394fcbbf5e17576c807
User & Date: dan 2011-04-04 07:05:38
Context
2011-04-04
12:29
Move the expired-statement test for OP_Function until after all memory has been freed. The test is still commented out, however. check-in: 425e3edb user: drh tags: trunk
07:05
Changes to oserror.test and syscall.test so that they work with the in-memory journal permutation test. check-in: 4e996f36 user: dan tags: trunk
03:27
Suppress unused parameter warnings in sqlite3VdbeEnter() and related routines. check-in: f8e98ab3 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/oserror.test.

96
97
98
99
100
101
102

103
104

105
106


107
108
109
110
111
112
113
114
115
116
117
118
#--------------------------------------------------------------------------
# Tests oserror-1.* test failures in the unlink() system call.
#
do_test 2.1.1 {
  set ::log [list]
  file mkdir test.db-wal
  forcedelete test.db

  sqlite3 dbh test.db
  catchsql { SELECT * FROM sqlite_master } dbh

} {1 {disk I/O error}}



do_re_test 2.1.2 { lindex $::log 0 } {^os_unix.c:\d+: \(\d+\) unlink\(.*test.db-wal\) - }
do_test 2.1.3 { 
  dbh close
  forcedelete test.db-wal
} {}
  

test_syscall reset
sqlite3_shutdown
test_sqlite3_log 
sqlite3_initialize
finish_test







>
|
|
>


>
>
|

|









96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
#--------------------------------------------------------------------------
# Tests oserror-1.* test failures in the unlink() system call.
#
do_test 2.1.1 {
  set ::log [list]
  file mkdir test.db-wal
  forcedelete test.db
  list [catch {
    sqlite3 dbh test.db
    execsql { SELECT * FROM sqlite_master } dbh
  } msg] $msg
} {1 {disk I/O error}}

do_re_test 2.1.2 { 
  lindex $::log 0 
} {^os_unix.c:\d+: \(\d+\) unlink\(.*test.db-wal\) - }
do_test 2.1.3 { 
  catch { dbh close }
  forcedelete test.db-wal
} {}
  

test_syscall reset
sqlite3_shutdown
test_sqlite3_log 
sqlite3_initialize
finish_test

Changes to test/syscall.test.

217
218
219
220
221
222
223

224
225

226
227
228
229
230
231
232
foreach {nByte res} {
  1      {0 {}}
  2      {1 {file is encrypted or is not a database}}
  3      {1 {file is encrypted or is not a database}}
} {
  do_test 7.$nByte {
    create_db_file $nByte

    sqlite3 db test.db
    catchsql { CREATE TABLE t1(a, b) }

  } $res
  catch { db close }
}

#-------------------------------------------------------------------------
# 
catch { db close }







>
|
|
>







217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
foreach {nByte res} {
  1      {0 {}}
  2      {1 {file is encrypted or is not a database}}
  3      {1 {file is encrypted or is not a database}}
} {
  do_test 7.$nByte {
    create_db_file $nByte
    list [catch {
      sqlite3 db test.db
      execsql { CREATE TABLE t1(a, b) }
    } msg] $msg
  } $res
  catch { db close }
}

#-------------------------------------------------------------------------
# 
catch { db close }