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

lib/model: Reset conn when enc token is missing (fixes #7198) (#7518)

Browse Source
This commit is contained in:
Simon Frei
2021-03-23 10:38:40 +01:00
committed by GitHub
parent 924b96856f
commit 0d7a77ba85
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/model_test.go
+6 -3
View File
@@ -428,7 +428,8 @@ func TestClusterConfig(t *testing.T) {
m.ServeBackground()
defer cleanupModel(m)
cm, _ := m.generateClusterConfig(device2)
cm, _, err := m.generateClusterConfig(device2)
must(t, err)
if l := len(cm.Folders); l != 2 {
t.Fatalf("Incorrect number of folders %d != 2", l)
@@ -853,7 +854,8 @@ func TestIssue4897(t *testing.T) {
defer cleanupModel(m)
cancel()
cm, _ := m.generateClusterConfig(device1)
cm, _, err := m.generateClusterConfig(device1)
must(t, err)
if l := len(cm.Folders); l != 1 {
t.Errorf("Cluster config contains %v folders, expected 1", l)
}
@@ -4142,7 +4144,8 @@ func TestCCFolderNotRunning(t *testing.T) {
defer cleanupModelAndRemoveDir(m, tfs.URI())
// A connection can happen before all the folders are started.
cc, _ := m.generateClusterConfig(device1)
cc, _, err := m.generateClusterConfig(device1)
must(t, err)
if l := len(cc.Folders); l != 1 {
t.Fatalf("Expected 1 folder in CC, got %v", l)
}