@@ -15,21 +15,18 @@ fn setup() {
15
15
env_logger:: builder ( )
16
16
. filter ( None , log:: LevelFilter :: Trace )
17
17
. init ( ) ;
18
- } ) ;
19
- }
20
18
21
- fn configure_cache_directory ( ) -> PathBuf {
22
- let cache_dir = PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) )
23
- . parent ( )
24
- . unwrap ( )
25
- . parent ( )
26
- . unwrap ( )
27
- . parent ( )
28
- . unwrap ( )
29
- . join ( "temp" )
30
- . join ( "pet_cache" ) ;
31
- set_cache_directory ( cache_dir. clone ( ) ) ;
32
- get_cache_directory ( ) . unwrap ( )
19
+ let cache_dir = PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) )
20
+ . parent ( )
21
+ . unwrap ( )
22
+ . parent ( )
23
+ . unwrap ( )
24
+ . parent ( )
25
+ . unwrap ( )
26
+ . join ( "temp" )
27
+ . join ( "pet_cache" ) ;
28
+ set_cache_directory ( cache_dir. clone ( ) ) ;
29
+ } ) ;
33
30
}
34
31
35
32
#[ cfg_attr(
@@ -55,7 +52,7 @@ fn verify_cache() {
55
52
56
53
setup ( ) ;
57
54
58
- let cache_dir = configure_cache_directory ( ) ;
55
+ let cache_dir = get_cache_directory ( ) . unwrap ( ) ;
59
56
let prefix: PathBuf = resolve_test_path ( & [ "unix" , "executables" , ".venv" ] ) . into ( ) ;
60
57
let bin = prefix. join ( "bin" ) ;
61
58
let python = bin. join ( "python" ) ;
@@ -124,7 +121,7 @@ fn verify_invalidating_cache() {
124
121
125
122
setup ( ) ;
126
123
127
- let cache_dir = configure_cache_directory ( ) ;
124
+ let cache_dir = get_cache_directory ( ) . unwrap ( ) ;
128
125
let prefix: PathBuf = resolve_test_path ( & [ "unix" , "executables" , ".venv2" ] ) . into ( ) ;
129
126
let bin = prefix. join ( "bin" ) ;
130
127
let python = bin. join ( "python" ) ;
@@ -180,7 +177,7 @@ fn verify_invalidating_cache_due_to_hash_conflicts() {
180
177
181
178
setup ( ) ;
182
179
183
- let cache_dir = configure_cache_directory ( ) ;
180
+ let cache_dir = get_cache_directory ( ) . unwrap ( ) ;
184
181
let prefix: PathBuf = resolve_test_path ( & [ "unix" , "executables" , ".venv3" ] ) . into ( ) ;
185
182
let bin = prefix. join ( "bin" ) ;
186
183
let python = bin. join ( "python" ) ;
0 commit comments