lib/model: Add option for overwriting names on connect (fixes #2912)

2016-04-09 07:43:47 +00:00
parent 2eb8a9ef56
commit 4389bb037d
5 changed files with 18 additions and 1 deletions
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -61,6 +61,7 @@ func TestDefaultValues(t *testing.T) {
 		URPostInsecurely:        false,
 		ReleasesURL:             "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30",
 		AlwaysLocalNets:         []string{},
+		OverwriteNames:          false,
 	}

 	cfg := New(device1)
@@ -190,6 +191,7 @@ func TestOverriddenValues(t *testing.T) {
 		URPostInsecurely:        true,
 		ReleasesURL:             "https://localhost/releases",
 		AlwaysLocalNets:         []string{},
+		OverwriteNames:          true,
 	}

 	cfg, err := Load("testdata/overridenvalues.xml", device1)