diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-10 05:05:06 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-10 05:05:06 +0000 |
| commit | c697be5b696fb3f49545aca12b35ac7feee05925 (patch) | |
| tree | 1fdc7326e900325703963d28c19f0711b994abd6 /actionpack/test/controller | |
| parent | 60499774c2a8ecd9d87b140ffbe24634559c3fcd (diff) | |
| download | rails-c697be5b696fb3f49545aca12b35ac7feee05925.tar.gz rails-c697be5b696fb3f49545aca12b35ac7feee05925.tar.bz2 rails-c697be5b696fb3f49545aca12b35ac7feee05925.zip | |
r2992@asus: jeremy | 2005-07-10 02:43:49 -0700
Skip ActiveRecordStore tests if neither SQLite 2 nor 3 is available.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1793 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/active_record_store_test.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/test/controller/active_record_store_test.rb b/actionpack/test/controller/active_record_store_test.rb index 05dcd691e6..688eff9d87 100644 --- a/actionpack/test/controller/active_record_store_test.rb +++ b/actionpack/test/controller/active_record_store_test.rb @@ -18,8 +18,14 @@ begin CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:') CGI::Session::ActiveRecordStore::Session.connection rescue Object - $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.' - CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:') + $stderr.puts 'SQLite 3 unavailable; falling back to SQLite 2.' + begin + CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:') + CGI::Session::ActiveRecordStore::Session.connection + rescue Object + $stderr.puts 'SQLite 2 unavailable; skipping ActiveRecordStore test suite.' + raise SystemExit + end end |