diff options
author | Jay Hayes <ur@iamvery.com> | 2015-04-26 22:20:08 -0500 |
---|---|---|
committer | Jay Hayes <ur@iamvery.com> | 2015-10-20 19:17:58 -0500 |
commit | 2893e6c0a459a91a033d357cd15cc4d14e7acbc1 (patch) | |
tree | 4f12f6cbe0a21139db2948648f3e1b44b571d973 /activerecord/test/cases | |
parent | 1cd35be3eb04da88d790493d3ce9807efeaeddba (diff) | |
download | rails-2893e6c0a459a91a033d357cd15cc4d14e7acbc1.tar.gz rails-2893e6c0a459a91a033d357cd15cc4d14e7acbc1.tar.bz2 rails-2893e6c0a459a91a033d357cd15cc4d14e7acbc1.zip |
Exit with non-zero status when db:create fails
* If the create task fails for a reason other than the database already
existing, processing should end. This is indicated by a non-zero exit
status.
* Since the backtrace is already printed to screen, we forgo printing it
again by using an explicit call to `exit`.
* :warning: This modifies the behavior of the db:create task slightly in
that the stack trace is no longer printed by default. If the `--trace`
option is used, it will print the trace _after_ the error message.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/tasks/postgresql_rake_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/tasks/sqlite_rake_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb index c3fd0b2383..c31f94b2f2 100644 --- a/activerecord/test/cases/tasks/postgresql_rake_test.rb +++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb @@ -60,7 +60,7 @@ module ActiveRecord $stderr.expects(:puts). with("Couldn't create database for #{@configuration.inspect}") - ActiveRecord::Tasks::DatabaseTasks.create @configuration + assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration } end def test_create_when_database_exists_outputs_info_to_stderr diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb index 750d5e42dc..0aea0c3b38 100644 --- a/activerecord/test/cases/tasks/sqlite_rake_test.rb +++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb @@ -53,7 +53,7 @@ module ActiveRecord $stderr.expects(:puts). with("Couldn't create database for #{@configuration.inspect}") - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' } end end |