File tree 2 files changed +7
-3
lines changed
git-index/tests/index/file
2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -103,9 +103,8 @@ fn state_comparisons_with_various_extension_configurations() {
103
103
}
104
104
105
105
#[ test]
106
- #[ ignore] // TODO: figure out why it fails on CI
107
106
fn extended_flags_automatically_upgrade_the_version_to_avoid_data_loss ( ) -> crate :: Result {
108
- let mut expected = git_index:: File :: at ( fixture_index_path ( "V2 " ) , Default :: default ( ) ) ?;
107
+ let mut expected = git_index:: File :: at ( fixture_index_path ( "v2 " ) , Default :: default ( ) ) ?;
109
108
assert_eq ! ( expected. version( ) , Version :: V2 ) ;
110
109
expected. entries_mut ( ) [ 0 ] . flags . insert ( entry:: Flags :: EXTENDED ) ;
111
110
Original file line number Diff line number Diff line change @@ -202,7 +202,12 @@ fn scripted_fixture_repo_read_only_with_args_inner(
202
202
. or_insert_with ( || {
203
203
let crc_value = crc:: Crc :: < u32 > :: new ( & crc:: CRC_32_CKSUM ) ;
204
204
let mut crc_digest = crc_value. digest ( ) ;
205
- crc_digest. update ( & std:: fs:: read ( & script_path) . expect ( "file can be read entirely" ) ) ;
205
+ crc_digest. update ( & std:: fs:: read ( & script_path) . unwrap_or_else ( |err| {
206
+ panic ! (
207
+ "file {script_path:?} in CWD {:?} could not be read: {err}" ,
208
+ std:: env:: current_dir( ) . expect( "valid cwd" ) ,
209
+ )
210
+ } ) ) ;
206
211
for arg in args. iter ( ) {
207
212
crc_digest. update ( arg. as_bytes ( ) ) ;
208
213
}
You can’t perform that action at this time.
0 commit comments