char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Keep the tempdir alive in the sqlite store tests.

master
Damir Jelić 2020-04-16 13:21:57 +02:00
parent 8e3c5889bb
commit 5b212a2fcd
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/crypto/store/sqlite.rs
View File

@ -449,13 +449,13 @@ mod test {
static USER_ID: &str = "@example:localhost"; static USER_ID: &str = "@example:localhost";
static DEVICE_ID: &str = "DEVICEID"; static DEVICE_ID: &str = "DEVICEID";
async fn get_store(passphrase: Option<&str>) -> SqliteStore { async fn get_store(passphrase: Option<&str>) -> (SqliteStore, tempfile::TempDir) {
let tmpdir = tempdir().unwrap(); let tmpdir = tempdir().unwrap();
let tmpdir_path = tmpdir.path().to_str().unwrap(); let tmpdir_path = tmpdir.path().to_str().unwrap();
let user_id = &UserId::try_from(USER_ID).unwrap(); let user_id = &UserId::try_from(USER_ID).unwrap();
if let Some(passphrase) = passphrase { let store = if let Some(passphrase) = passphrase {
SqliteStore::open_with_passphrase( SqliteStore::open_with_passphrase(
&user_id, &user_id,
DEVICE_ID, DEVICE_ID,
@ -468,11 +468,13 @@ mod test {
SqliteStore::open(&user_id, DEVICE_ID, tmpdir_path) SqliteStore::open(&user_id, DEVICE_ID, tmpdir_path)
.await .await
.expect("Can't create store") .expect("Can't create store")
} };
(store, tmpdir)
} }
async fn get_loaded_store() -> (Account, SqliteStore) { async fn get_loaded_store() -> (Account, SqliteStore) {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let account = get_account(); let account = get_account();
store store
.save_account(account.clone()) .save_account(account.clone())
@ -525,7 +527,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn save_account() { async fn save_account() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
assert!(store.load_account().await.unwrap().is_none()); assert!(store.load_account().await.unwrap().is_none());
let account = get_account(); let account = get_account();
@ -537,7 +539,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn load_account() { async fn load_account() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let account = get_account(); let account = get_account();
store store
@ -553,7 +555,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn load_account_with_passphrase() { async fn load_account_with_passphrase() {
let mut store = get_store(Some("secret_passphrase")).await; let (mut store, _dir) = get_store(Some("secret_passphrase")).await;
let account = get_account(); let account = get_account();
store store
@ -569,7 +571,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn save_and_share_account() { async fn save_and_share_account() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let account = get_account(); let account = get_account();
store store
@ -592,7 +594,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn save_session() { async fn save_session() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let (account, session) = get_account_and_session().await; let (account, session) = get_account_and_session().await;
assert!(store.save_session(session.clone()).await.is_err()); assert!(store.save_session(session.clone()).await.is_err());
@ -607,7 +609,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn load_sessions() { async fn load_sessions() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let (account, session) = get_account_and_session().await; let (account, session) = get_account_and_session().await;
store store
.save_account(account.clone()) .save_account(account.clone())
@ -626,7 +628,7 @@ mod test {
#[tokio::test] #[tokio::test]
async fn add_and_save_session() { async fn add_and_save_session() {
let mut store = get_store(None).await; let (mut store, _dir) = get_store(None).await;
let (account, session) = get_account_and_session().await; let (account, session) = get_account_and_session().await;
let sender_key = session.sender_key.to_owned(); let sender_key = session.sender_key.to_owned();
let session_id = session.session_id().to_owned(); let session_id = session.session_id().to_owned();