@@ -102,13 +102,11 @@ fn load_entries_from_database(
102102
103103#[ cfg( test) ]
104104mod tests {
105- use std:: { env , path:: Path , sync :: Mutex } ;
105+ use std:: path:: Path ;
106106
107107 use super :: * ;
108108 use crate :: { PricingMap , cli:: CostMode } ;
109- use ccusage_test_support:: fs_fixture;
110-
111- static KILO_DATA_DIR_LOCK : Mutex < ( ) > = Mutex :: new ( ( ) ) ;
109+ use ccusage_test_support:: { EnvVarGuard , fs_fixture} ;
112110
113111 fn create_db_message ( path : & Path , id : & str , session_id : & str , data : & str ) {
114112 let db = sqlite:: open ( path) . unwrap ( ) ;
@@ -125,22 +123,20 @@ mod tests {
125123
126124 #[ test]
127125 fn loads_kilo_messages_from_sqlite ( ) {
128- let _guard = KILO_DATA_DIR_LOCK . lock ( ) . unwrap ( ) ;
129126 let fixture = fs_fixture ! ( { } ) ;
130127 create_db_message (
131128 & fixture. path ( super :: super :: paths:: KILO_DB_FILE_NAME ) ,
132129 "row-1" ,
133130 "session-a" ,
134131 r#"{"id":"msg-1","role":"assistant","providerID":"anthropic","modelID":"claude-sonnet-4-20250514","time":{"created":1767312000000},"tokens":{"input":100,"output":50,"reasoning":5,"cache":{"read":10,"write":20}},"cost":0.02,"agent":"build"}"# ,
135132 ) ;
136- unsafe { env :: set_var ( super :: super :: paths:: KILO_DATA_DIR_ENV , fixture. root ( ) ) } ;
133+ let _cleanup = EnvVarGuard :: set ( super :: super :: paths:: KILO_DATA_DIR_ENV , fixture. root ( ) ) ;
137134 let shared = SharedArgs {
138135 mode : CostMode :: Display ,
139136 timezone : Some ( "UTC" . to_string ( ) ) ,
140137 ..SharedArgs :: default ( )
141138 } ;
142139 let entries = load_entries ( & shared, & PricingMap :: load_embedded ( ) ) . unwrap ( ) ;
143- unsafe { env:: remove_var ( super :: super :: paths:: KILO_DATA_DIR_ENV ) } ;
144140
145141 assert_eq ! ( entries. len( ) , 1 ) ;
146142 assert_eq ! ( entries[ 0 ] . date, "2026-01-02" ) ;
@@ -162,25 +158,22 @@ mod tests {
162158
163159 #[ test]
164160 fn ignores_kilo_messages_without_timestamps ( ) {
165- let _guard = KILO_DATA_DIR_LOCK . lock ( ) . unwrap ( ) ;
166161 let fixture = fs_fixture ! ( { } ) ;
167162 create_db_message (
168163 & fixture. path ( super :: super :: paths:: KILO_DB_FILE_NAME ) ,
169164 "row-1" ,
170165 "session-a" ,
171166 r#"{"role":"assistant","providerID":"openai","modelID":"gpt-5","tokens":{"input":1,"output":1,"cache":{"read":0,"write":0}}}"# ,
172167 ) ;
173- unsafe { env :: set_var ( super :: super :: paths:: KILO_DATA_DIR_ENV , fixture. root ( ) ) } ;
168+ let _cleanup = EnvVarGuard :: set ( super :: super :: paths:: KILO_DATA_DIR_ENV , fixture. root ( ) ) ;
174169 let shared = SharedArgs :: default ( ) ;
175170 let entries = load_entries ( & shared, & PricingMap :: load_embedded ( ) ) . unwrap ( ) ;
176- unsafe { env:: remove_var ( super :: super :: paths:: KILO_DATA_DIR_ENV ) } ;
177171
178172 assert ! ( entries. is_empty( ) ) ;
179173 }
180174
181175 #[ test]
182176 fn deduplicates_kilo_messages_across_data_dirs ( ) {
183- let _guard = KILO_DATA_DIR_LOCK . lock ( ) . unwrap ( ) ;
184177 let first = fs_fixture ! ( { } ) ;
185178 let second = fs_fixture ! ( { } ) ;
186179 for ( fixture, input) in [ ( & first, 10 ) , ( & second, 20 ) ] {
@@ -193,15 +186,12 @@ mod tests {
193186 ) ,
194187 ) ;
195188 }
196- unsafe {
197- env:: set_var (
198- super :: super :: paths:: KILO_DATA_DIR_ENV ,
199- format ! ( "{},{}" , first. root( ) . display( ) , second. root( ) . display( ) ) ,
200- )
201- } ;
189+ let _cleanup = EnvVarGuard :: set (
190+ super :: super :: paths:: KILO_DATA_DIR_ENV ,
191+ format ! ( "{},{}" , first. root( ) . display( ) , second. root( ) . display( ) ) ,
192+ ) ;
202193 let shared = SharedArgs :: default ( ) ;
203194 let entries = load_entries ( & shared, & PricingMap :: load_embedded ( ) ) . unwrap ( ) ;
204- unsafe { env:: remove_var ( super :: super :: paths:: KILO_DATA_DIR_ENV ) } ;
205195
206196 assert_eq ! ( entries. len( ) , 1 ) ;
207197 assert_eq ! ( entries[ 0 ] . data. message. usage. input_tokens, 10 ) ;
0 commit comments