diff options
author | Azul <azul@riseup.net> | 2014-02-04 15:47:55 +0100 |
---|---|---|
committer | Azul <azul@riseup.net> | 2014-02-04 16:20:12 +0100 |
commit | 7bb4ab417c0275fcca03abe338b3b81c17b17a6e (patch) | |
tree | 5b6db1de8c82b57114f76372857d50ab111f9ca1 /lib | |
parent | 5cd3df1a9be8e7db2f3e364fd730ed78c8d0e49f (diff) |
prevent 409s and 412 and reraise them in tests
Including tests that ensure this
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tapicero.rb | 6 | ||||
-rw-r--r-- | lib/tapicero/user_database.rb | 8 | ||||
-rw-r--r-- | lib/tapicero/user_event_handler.rb | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/lib/tapicero.rb b/lib/tapicero.rb index 1063b85..a098287 100644 --- a/lib/tapicero.rb +++ b/lib/tapicero.rb @@ -8,7 +8,11 @@ module Tapicero attr_accessor :config end - + # reraise exceptions instead of retrying + # used in tests + unless defined? RERAISE + RERAISE = false + end # # Load Config # this must come first, because CouchRest needs the connection diff --git a/lib/tapicero/user_database.rb b/lib/tapicero/user_database.rb index 6daccf3..26d013d 100644 --- a/lib/tapicero/user_database.rb +++ b/lib/tapicero/user_database.rb @@ -35,8 +35,9 @@ module Tapicero end def upload_design_doc(file) + old = CouchRest.get design_url(file.basename('.json')) + rescue RestClient::ResourceNotFound CouchRest.put design_url(file.basename('.json')), JSON.parse(file.read) - rescue RestClient::Conflict end @@ -53,7 +54,9 @@ module Tapicero protected def create_db - db.create! || db.info + db.info # test if db exists + rescue RestClient::ResourceNotFound + couch.create_db(db.name) end def delete_db @@ -66,6 +69,7 @@ module Tapicero Tapicero.logger.debug "#{action} #{db.name}" yield rescue RestClient::Exception => exc + raise exc if Tapicero::RERAISE if second_try log_error "#{action} #{db.name} failed twice due to:", exc else diff --git a/lib/tapicero/user_event_handler.rb b/lib/tapicero/user_event_handler.rb index d19e23d..38cf8f8 100644 --- a/lib/tapicero/user_event_handler.rb +++ b/lib/tapicero/user_event_handler.rb @@ -19,6 +19,8 @@ module Tapicero end end + protected + def prepare_db(id) db = user_database(id) db.create |