chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d21c27e
)
wdt-hand: Check for lack of conflicts
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 14 Mar 2021 20:38:44 +0000
(20:38 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 14 Mar 2021 21:54:42 +0000
(21:54 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
wdriver/wdt-hand.rs
patch
|
blob
|
history
diff --git
a/wdriver/wdt-hand.rs
b/wdriver/wdt-hand.rs
index 0a2cc791a9c2f8d0a2932fa7612686a0ba7cc174..423d21c5dda318b952bf7fab0ffe8eacdde6455f 100644
(file)
--- a/
wdriver/wdt-hand.rs
+++ b/
wdriver/wdt-hand.rs
@@
-72,6
+72,13
@@
impl Ctx {
chk(&mut w, HAND, Some(ALICE))?;
}
+ for side in &[&self.alice, &self.bob] {
+ let mut w = su.w(side)?;
+ w.synch()?;
+ let log = w.retrieve_log(&mut |_|false)?;
+ assert_eq!(log.find_conflict(), None);
+ }
+
{
let mut w = su.w(&self.alice)?;
w.action_chain()