Merge pull request #460 from mozilla-services/459-fix-db-tests

fix: Fix #459 db-tests on master
This commit is contained in:
Donovan Preston 2020-03-02 13:53:40 -05:00 committed by GitHub
commit 13b44f488d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1858,16 +1858,30 @@ impl Db for SpannerDb {
Box::pin(async move { db.get_bso_timestamp_async(param).map_err(Into::into).await })
}
#[cfg(not(any(test, feature = "db_test")))]
fn put_bso(&self, param: params::PutBso) -> DbFuture<results::PutBso> {
let db = self.clone();
Box::pin(async move { db.put_bso_async(param).map_err(Into::into).await })
}
#[cfg(any(test, feature = "db_test"))]
fn put_bso(&self, param: params::PutBso) -> DbFuture<results::PutBso> {
let db = self.clone();
Box::pin(block(move || db.put_bso_sync(param).map_err(Into::into)).map_err(Into::into))
}
#[cfg(not(any(test, feature = "db_test")))]
fn post_bsos(&self, param: params::PostBsos) -> DbFuture<results::PostBsos> {
let db = self.clone();
Box::pin(async move { db.post_bsos_async(param).map_err(Into::into).await })
}
#[cfg(any(test, feature = "db_test"))]
fn post_bsos(&self, param: params::PostBsos) -> DbFuture<results::PostBsos> {
let db = self.clone();
Box::pin(block(move || db.post_bsos_sync(param).map_err(Into::into)).map_err(Into::into))
}
fn validate_batch_id(&self, id: String) -> Result<()> {
batch::validate_batch_id(&id)
}