Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve assertion message when buffer state diverges

Browse source
This commit is contained in:
Antonio Scandurra 2023-04-10 10:01:44 +02:00
parent 016343e65d
commit 3a82c04248
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/collab/src/tests/randomized_integration_tests.rs
View file

@ -981,7 +981,8 @@ fn check_consistency_between_clients(clients: &[(Rc<TestClient>, TestAppContext)
guest_buffer.read_with(client_cx, |b, _| b.saved_version().clone()); guest_buffer.read_with(client_cx, |b, _| b.saved_version().clone());
assert_eq!( assert_eq!(
guest_saved_version, host_saved_version, guest_saved_version, host_saved_version,
"guest saved version does not match host's for path {path:?} in project {project_id}", "guest {} saved version does not match host's for path {path:?} in project {project_id}",
client.username
); );
let host_saved_version_fingerprint = let host_saved_version_fingerprint =
@ -990,26 +991,30 @@ fn check_consistency_between_clients(clients: &[(Rc<TestClient>, TestAppContext)
guest_buffer.read_with(client_cx, |b, _| b.saved_version_fingerprint()); guest_buffer.read_with(client_cx, |b, _| b.saved_version_fingerprint());
assert_eq!( assert_eq!(
guest_saved_version_fingerprint, host_saved_version_fingerprint, guest_saved_version_fingerprint, host_saved_version_fingerprint,
"guest's saved fingerprint does not match host's for path {path:?} in project {project_id}", "guest {} saved fingerprint does not match host's for path {path:?} in project {project_id}",
client.username
); );
let host_saved_mtime = host_buffer.read_with(host_cx, |b, _| b.saved_mtime()); let host_saved_mtime = host_buffer.read_with(host_cx, |b, _| b.saved_mtime());
let guest_saved_mtime = guest_buffer.read_with(client_cx, |b, _| b.saved_mtime()); let guest_saved_mtime = guest_buffer.read_with(client_cx, |b, _| b.saved_mtime());
assert_eq!( assert_eq!(
guest_saved_mtime, host_saved_mtime, guest_saved_mtime, host_saved_mtime,
"guest's saved mtime does not match host's for path {path:?} in project {project_id}", "guest {} saved mtime does not match host's for path {path:?} in project {project_id}",
client.username
); );
let host_is_dirty = host_buffer.read_with(host_cx, |b, _| b.is_dirty()); let host_is_dirty = host_buffer.read_with(host_cx, |b, _| b.is_dirty());
let guest_is_dirty = guest_buffer.read_with(client_cx, |b, _| b.is_dirty()); let guest_is_dirty = guest_buffer.read_with(client_cx, |b, _| b.is_dirty());
assert_eq!(guest_is_dirty, host_is_dirty, assert_eq!(guest_is_dirty, host_is_dirty,
"guest's dirty status does not match host's for path {path:?} in project {project_id}", "guest {} dirty status does not match host's for path {path:?} in project {project_id}",
client.username
); );
let host_has_conflict = host_buffer.read_with(host_cx, |b, _| b.has_conflict()); let host_has_conflict = host_buffer.read_with(host_cx, |b, _| b.has_conflict());
let guest_has_conflict = guest_buffer.read_with(client_cx, |b, _| b.has_conflict()); let guest_has_conflict = guest_buffer.read_with(client_cx, |b, _| b.has_conflict());
assert_eq!(guest_has_conflict, host_has_conflict, assert_eq!(guest_has_conflict, host_has_conflict,
"guest's conflict status does not match host's for path {path:?} in project {project_id}", "guest {} conflict status does not match host's for path {path:?} in project {project_id}",
client.username
); );
} }
} }