From dc8015f6695ee069279dfbd681000e8b1fcd30e5 Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Wed, 26 Feb 2025 20:56:18 -0500 Subject: Remove module level `Session` initialization in Rust unit tests This was preventing the enterprise license checkout from dropping, also the initialization story is much better than it was when we added the rstest fixtures, we can get away with initialization in parallel more broadly. --- rust/tests/binary_view.rs | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'rust/tests/binary_view.rs') diff --git a/rust/tests/binary_view.rs b/rust/tests/binary_view.rs index 08e530aa..e48d5f52 100644 --- a/rust/tests/binary_view.rs +++ b/rust/tests/binary_view.rs @@ -2,17 +2,11 @@ use binaryninja::binary_view::{AnalysisState, BinaryViewBase, BinaryViewExt}; use binaryninja::headless::Session; use binaryninja::main_thread::execute_on_main_thread_and_wait; use binaryninja::symbol::{SymbolBuilder, SymbolType}; -use rstest::*; use std::path::PathBuf; -#[fixture] -#[once] -fn session() -> Session { - Session::new().expect("Failed to initialize session") -} - -#[rstest] -fn test_binary_loading(_session: &Session) { +#[test] +fn test_binary_loading() { + let _session = Session::new().expect("Failed to initialize session"); let out_dir = env!("OUT_DIR").parse::().unwrap(); let view = binaryninja::load(out_dir.join("atox.obj")).expect("Failed to create view"); assert!(view.has_initial_analysis(), "No initial analysis"); @@ -21,8 +15,9 @@ fn test_binary_loading(_session: &Session) { assert_eq!(view.file().is_database_backed(), false); } -#[rstest] -fn test_binary_saving(_session: &Session) { +#[test] +fn test_binary_saving() { + let _session = Session::new().expect("Failed to initialize session"); let out_dir = env!("OUT_DIR").parse::().unwrap(); let view = binaryninja::load(out_dir.join("atox.obj")).expect("Failed to create view"); // Verify the contents before we modify. @@ -48,8 +43,9 @@ fn test_binary_saving(_session: &Session) { ); } -#[rstest] -fn test_binary_saving_database(_session: &Session) { +#[test] +fn test_binary_saving_database() { + let _session = Session::new().expect("Failed to initialize session"); let out_dir = env!("OUT_DIR").parse::().unwrap(); let view = binaryninja::load(out_dir.join("atox.obj")).expect("Failed to create view"); // Update a symbol to verify modification -- cgit v1.3.1