github/Bose-SoundTouch
1
0
Fork 0
mirror of https://github.com/gesellix/Bose-SoundTouch.git synced 2026-09-07 15:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stereo): accept right-role group masters

Browse Source
This commit is contained in:
Lukáš Lipinský
2026-09-05 11:08:04 +02:00
committed by Tobias Gesellchen
parent 2d074d4ecf
commit 58c8baa113
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/stereopair/coordinator.go
+2 -2
View File
@@ -1436,8 +1436,8 @@ func pairMembers(group *models.Group) ([]models.GroupRole, error) {
return nil, errors.New("stereo pair requires distinct LEFT and RIGHT members")
}
if group.MasterDeviceID != left.DeviceID {
return nil, errors.New("LEFT member must be the group master")
if group.MasterDeviceID != left.DeviceID && group.MasterDeviceID != right.DeviceID {
return nil, errors.New("group master must be a stereo-pair member")
}
return []models.GroupRole{left, right}, nil
pkg/stereopair/coordinator_test.go
+51
View File
@@ -604,6 +604,57 @@ func TestInspectReturnsCanonicalFreshPair(t *testing.T) {
}
}
func TestInspectAcceptsRightMemberAsGroupMaster(t *testing.T) {
group := configuredGroup("Pair")
group.MasterDeviceID = rightID
left := readyClient(leftID, "Left")
right := readyClient(rightID, "Right")
left.group = cloneGroup(group)
right.group = cloneGroup(group)
coordinator := New(factoryFor(map[string]*fakeClient{leftIP: left, rightIP: right}))
result, err := coordinator.Inspect(rightIP)
if err != nil {
t.Fatalf("Inspect: %v", err)
}
if result.Status != StatusSucceeded || result.Group == nil || result.Group.MasterDeviceID != rightID {
t.Fatalf("result = %+v", result)
}
if len(result.Members) != 2 || !result.Members[0].Verified || !result.Members[1].Verified {
t.Fatalf("member reads were not verified: %+v", result.Members)
}
}
func TestInspectRejectsMalformedOrNonMemberGroupMaster(t *testing.T) {
tests := []struct {
name string
masterID string
}{
{name: "empty", masterID: ""},
{name: "non-member", masterID: "OTHER-ID"},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
group := configuredGroup("Pair")
group.MasterDeviceID = test.masterID
left := readyClient(leftID, "Left")
right := readyClient(rightID, "Right")
left.group = cloneGroup(group)
right.group = cloneGroup(group)
coordinator := New(factoryFor(map[string]*fakeClient{leftIP: left, rightIP: right}))
result, err := coordinator.Inspect(leftIP)
if err == nil || result.Status != StatusFailed {
t.Fatalf("result = %+v, err = %v", result, err)
}
if len(result.Members) != 1 || !errors.Is(result.Members[0].PreflightError, ErrConflict) {
t.Fatalf("invalid master was not rejected as a conflict: %+v", result.Members)
}
})
}
}
func TestInspectPreservesGenerationForPartialDissolveRecovery(t *testing.T) {
left := readyClient(leftID, "Left")
right := readyClient(rightID, "Right")