felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/model: Fix passwords on receive-enc needing token (ref #7518) (#7739)

Browse Source
This commit is contained in:
Simon Frei
2021-06-03 15:39:49 +02:00
committed by GitHub
parent 52eb7392c4
commit 41baccb85d
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/model_test.go
+3 -6
View File
@@ -430,8 +430,7 @@ func TestClusterConfig(t *testing.T) {
m.ServeBackground()
defer cleanupModel(m)
cm, _, err := m.generateClusterConfig(device2)
must(t, err)
cm, _ := m.generateClusterConfig(device2)
if l := len(cm.Folders); l != 2 {
t.Fatalf("Incorrect number of folders %d != 2", l)
@@ -868,8 +867,7 @@ func TestIssue4897(t *testing.T) {
defer cleanupModel(m)
cancel()
cm, _, err := m.generateClusterConfig(device1)
must(t, err)
cm, _ := m.generateClusterConfig(device1)
if l := len(cm.Folders); l != 1 {
t.Errorf("Cluster config contains %v folders, expected 1", l)
}
@@ -4160,8 +4158,7 @@ func TestCCFolderNotRunning(t *testing.T) {
defer cleanupModelAndRemoveDir(m, tfs.URI())
// A connection can happen before all the folders are started.
cc, _, err := m.generateClusterConfig(device1)
must(t, err)
cc, _ := m.generateClusterConfig(device1)
if l := len(cc.Folders); l != 1 {
t.Fatalf("Expected 1 folder in CC, got %v", l)
}