Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/db_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,12 @@ impl SqliteScanPathService {
.ok_or(ConfigurationError::MissingBeamline(beamline.into()))
}

/// Create a db service from a new empty/schema-less DB
#[cfg(test)]
pub(crate) async fn ro_memory() -> Self {
let db = Self::memory().await;
db.pool
.set_connect_options(SqliteConnectOptions::new().read_only(true));
db
pub(crate) async fn uninitialised() -> Self {
Self {
pool: SqlitePool::connect(":memory:").await.unwrap(),
}
}

#[cfg(test)]
Expand Down Expand Up @@ -492,11 +492,13 @@ mod db_tests {
}

#[test]
async fn read_only_db_propagates_errors() {
let db = SqliteScanPathService::ro_memory().await;
async fn uninitialised_db_propagates_errors() {
let db = SqliteScanPathService::uninitialised().await;
let e = err!(NewConfigurationError::Db, update("i22").insert_new(&db));
let e = e.into_database_error().unwrap().downcast::<SqliteError>();
assert_eq!(e.kind(), ErrorKind::Other);
// "1" is the magic number for 'Generic Error'
assert_eq!(e.code(), Some("1".into()));
}

#[test]
Expand Down