f Use random path for SqliteStore tests

Author: tnull

src/io/sqlite_store/migrations.rs

@@ -37,6 +37,7 @@ pub(super) fn migrate_schema(
 mod tests {
 	use crate::io::sqlite_store::SqliteStore;
 	use crate::io::test_utils::do_read_write_remove_list_persist;
+	use crate::test::utils::random_storage_path;
 
 	use lightning::util::persist::KVStore;
 
@@ -48,7 +49,7 @@ mod tests {
 	fn rwrl_post_schema_1_migration() {
 		let old_schema_version = 1;
 
-		let mut temp_path = std::env::temp_dir();
+		let mut temp_path = random_storage_path();
 		temp_path.push("rwrl_post_schema_1_migration");
 
 		let db_file_name = "test_db".to_string();

src/io/sqlite_store/mod.rs

@@ -281,6 +281,7 @@ impl KVStore for SqliteStore {
 mod tests {
 	use super::*;
 	use crate::io::test_utils::{do_read_write_remove_list_persist, do_test_store};
+	use crate::test::utils::random_storage_path;
 
 	impl Drop for SqliteStore {
 		fn drop(&mut self) {
@@ -293,7 +294,7 @@ mod tests {
 
 	#[test]
 	fn read_write_remove_list_persist() {
-		let mut temp_path = std::env::temp_dir();
+		let mut temp_path = random_storage_path();
 		temp_path.push("read_write_remove_list_persist");
 		let store = SqliteStore::new(
 			temp_path,
@@ -306,7 +307,7 @@ mod tests {
 
 	#[test]
 	fn test_sqlite_store() {
-		let mut temp_path = std::env::temp_dir();
+		let mut temp_path = random_storage_path();
 		temp_path.push("test_sqlite_store");
 		let store_0 = SqliteStore::new(
 			temp_path.clone(),

src/test/utils.rs

@@ -20,6 +20,7 @@ use std::collections::hash_map;
 use std::collections::HashMap;
 use std::env;
 use std::io::{self, Write};
+use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::sync::Mutex;
@@ -220,10 +221,12 @@ impl Logger for TestLogger {
 	}
 }
 
-pub fn random_storage_path() -> String {
+pub fn random_storage_path() -> PathBuf {
+	let mut temp_path = std::env::temp_dir();
 	let mut rng = thread_rng();
 	let rand_dir: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
-	format!("/tmp/{}", rand_dir)
+	temp_path.push(rand_dir);
+	temp_path
 }
 
 pub fn random_port() -> u16 {
@@ -238,8 +241,8 @@ pub fn random_config() -> Config {
 	println!("Setting network: {}", config.network);
 
 	let rand_dir = random_storage_path();
-	println!("Setting random LDK storage dir: {}", rand_dir);
-	config.storage_dir_path = rand_dir;
+	println!("Setting random LDK storage dir: {}", rand_dir.display());
+	config.storage_dir_path = rand_dir.to_str().unwrap().to_owned();
 
 	let rand_port = random_port();
 	println!("Setting random LDK listening port: {}", rand_port);