Fix deadlock when comparing FileHandles when handles are the same

This commit is contained in:
Antonio Scandurra
2021-06-21 16:18:18 +02:00
parent 95024c616e
commit 7489e86c47
5 changed files with 63 additions and 27 deletions
+8 -2
View File
@@ -430,14 +430,20 @@ mod tests {
let response2 = proto::AuthResponse {
credentials_valid: false,
};
let request3 = proto::OpenBuffer { id: 2 };
let request3 = proto::OpenBuffer {
worktree_id: 1,
id: 2,
};
let response3 = proto::OpenBufferResponse {
buffer: Some(proto::Buffer {
content: "path/two content".to_string(),
history: vec![],
}),
};
let request4 = proto::OpenBuffer { id: 1 };
let request4 = proto::OpenBuffer {
worktree_id: 2,
id: 1,
};
let response4 = proto::OpenBufferResponse {
buffer: Some(proto::Buffer {
content: "path/one content".to_string(),
+5 -1
View File
@@ -145,7 +145,11 @@ mod tests {
}
.into_envelope(3, None, None);
let message2 = OpenBuffer { id: 1 }.into_envelope(5, None, None);
let message2 = OpenBuffer {
worktree_id: 0,
id: 1,
}
.into_envelope(5, None, None);
let mut message_stream = MessageStream::new(byte_stream);
message_stream.write_message(&message1).await.unwrap();