From 3813a219e0fdf433327b5f0f5d9fcc3488f62233 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 13 May 2019 11:45:55 +0200 Subject: [PATCH] Wrap dc_context_t and TempDir in a struct --- tests/stress.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/stress.rs b/tests/stress.rs index f8964cae7..1d7c74c8a 100644 --- a/tests/stress.rs +++ b/tests/stress.rs @@ -6,7 +6,7 @@ use mmime::mailimf_types::*; use mmime::mailmime_content::*; use mmime::mailmime_types::*; use mmime::other::*; -use tempfile::tempdir; +use tempfile::{tempdir, TempDir}; use deltachat::constants::*; use deltachat::dc_array::*; @@ -4476,7 +4476,13 @@ unsafe extern "C" fn cb( 0 } -unsafe fn create_context() -> dc_context_t { +#[allow(dead_code)] +struct TestContext { + ctx: dc_context_t, + dir: TempDir, +} + +unsafe fn create_test_context() -> TestContext { let mut ctx = dc_context_new(cb, std::ptr::null_mut(), std::ptr::null_mut()); let dir = tempdir().unwrap(); let dbfile = CString::new(dir.path().join("db.sqlite").to_str().unwrap()).unwrap(); @@ -4489,13 +4495,13 @@ unsafe fn create_context() -> dc_context_t { .unwrap() ); - ctx + TestContext { ctx: ctx, dir: dir } } #[test] fn run_stress_tests() { unsafe { - let ctx = create_context(); - stress_functions(&ctx); + let context = create_test_context(); + stress_functions(&context.ctx); } }