summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/soak.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/test/soak.py b/test/soak.py
index 8c73aa1e..73419e92 100644
--- a/test/soak.py
+++ b/test/soak.py
@@ -314,7 +314,9 @@ class Base:
tot['typed'] += int(b or 0)
for k in keys:
try:
- tot[k] += int(d.get(k, 0))
+ # `visible` is the link's (its process's) count so far, the
+ # rest each replica's own.
+ tot[k] = max(tot[k], int(d.get(k, 0))) if k == 'visible' else tot[k] + int(d.get(k, 0))
except ValueError:
pass
return tot
@@ -391,8 +393,11 @@ class TtyClient(Base):
return self.term.joined_again
def rejoins(self):
- """Joins again: (after a divergence, after an Upgrade's refusal)."""
- up = getattr(self.term, 'shown_upgrade', 0)
+ """Joins again: (after a divergence, after an Upgrade's refusal). A
+ terminal's notice can be gone before a frame shows it: the Upgrades
+ made while it ran are counted as its refusals."""
+ end = getattr(self, 'ended_at', None) or now()
+ up = max(getattr(self.term, 'shown_upgrade', 0), sum(1 for t in self.run.upgrade_times if self.started <= t <= end))
return max(getattr(self.term, 'shown_diverged', 0), len(self.links()) - 1 - up), up
def hangup(self):
@@ -762,6 +767,7 @@ class Run:
self.session_pid = None
self.epochs = 0
self.made = [0]
+ self.upgrade_times = []
def reset_session(self):
"""What a dead session left (its daemon, its shells, its sockets) gone,
@@ -1126,10 +1132,10 @@ def global_event(run, rng, live, made):
"""Something happens beside the typing: a resize, a client detached and
another attached, an Upgrade, a script's edit over 9P."""
kinds = [e for e in run.args.events.split(',') if e]
- if not kinds:
- return None
if run.args.upgrade and not getattr(run, 'upgraded', False):
kinds.append('upgrade')
+ if not kinds:
+ return None
what = rng.choice(kinds)
if what == 'resize':
c = rng.choice(live)
@@ -1161,6 +1167,7 @@ def global_event(run, rng, live, made):
elif what == 'upgrade':
run.note('Upgrade')
run.upgraded = True
+ run.upgrade_times.append(now())
run.nine_write('/ctl', b'Upgrade\n')
time.sleep(3)
if run.nine: