Merge ~kissiel/checkbox-ng:fix-crash-on-second-session into checkbox-ng:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 3797e74f9156c6a7db5a68bc17d35716c5695b82
Merged at revision: 334a1cfe360b1724ea4f9226b5a8fd4639ab1479
Proposed branch: ~kissiel/checkbox-ng:fix-crash-on-second-session
Merge into: checkbox-ng:master
Diff against target: 15 lines (+4/-0)
1 file modified
checkbox_ng/launcher/slave.py (+4/-0)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+382987@code.launchpad.net

Description of the change

Fix slave crashing when a second session is started without restarting the slave.

See https://bugs.launchpad.net/checkbox-ng/+bug/1874105 for details

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

Waiting on potential fixes for problems during report generation before landing this.

Revision history for this message
Jonathan Cave (jocave) wrote :

In combination with https://code.launchpad.net/~kissiel/checkbox-ng/+git/checkbox-ng/+merge/383061 this appears to allow for multiple sessions that conclude cleanly. Thanks!

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkbox_ng/launcher/slave.py b/checkbox_ng/launcher/slave.py
2index 81b884e..c1b03ea 100644
3--- a/checkbox_ng/launcher/slave.py
4+++ b/checkbox_ng/launcher/slave.py
5@@ -77,6 +77,10 @@ class SessionAssistantSlave(rpyc.Service):
6 old_master.close()
7 SessionAssistantSlave.controlling_master_conn = conn
8
9+ def on_disconnect(self, conn):
10+ SessionAssistantSlave.master_blaster = None
11+ self.controlling_master_conn = None
12+
13
14 class RemoteSlave():
15 """

Subscribers

People subscribed via source and target branches