Fix config tests for autoUpgradeIntervalH

This commit is contained in:
Jakob Borg 2014-09-28 22:38:10 +02:00
parent a76efd4166
commit 991dc32a0b
3 changed files with 31 additions and 28 deletions

View File

@ -23,20 +23,21 @@ func init() {
func TestDefaultValues(t *testing.T) { func TestDefaultValues(t *testing.T) {
expected := OptionsConfiguration{ expected := OptionsConfiguration{
ListenAddress: []string{"0.0.0.0:22000"}, ListenAddress: []string{"0.0.0.0:22000"},
GlobalAnnServer: "announce.syncthing.net:22026", GlobalAnnServer: "announce.syncthing.net:22026",
GlobalAnnEnabled: true, GlobalAnnEnabled: true,
LocalAnnEnabled: true, LocalAnnEnabled: true,
LocalAnnPort: 21025, LocalAnnPort: 21025,
LocalAnnMCAddr: "[ff32::5222]:21026", LocalAnnMCAddr: "[ff32::5222]:21026",
MaxSendKbps: 0, MaxSendKbps: 0,
MaxRecvKbps: 0, MaxRecvKbps: 0,
ReconnectIntervalS: 60, ReconnectIntervalS: 60,
StartBrowser: true, StartBrowser: true,
UPnPEnabled: true, UPnPEnabled: true,
UPnPLease: 0, UPnPLease: 0,
UPnPRenewal: 30, UPnPRenewal: 30,
RestartOnWakeup: true, RestartOnWakeup: true,
AutoUpgradeIntervalH: 12,
} }
cfg := New("test", device1) cfg := New("test", device1)
@ -114,20 +115,21 @@ func TestNoListenAddress(t *testing.T) {
func TestOverriddenValues(t *testing.T) { func TestOverriddenValues(t *testing.T) {
expected := OptionsConfiguration{ expected := OptionsConfiguration{
ListenAddress: []string{":23000"}, ListenAddress: []string{":23000"},
GlobalAnnServer: "syncthing.nym.se:22026", GlobalAnnServer: "syncthing.nym.se:22026",
GlobalAnnEnabled: false, GlobalAnnEnabled: false,
LocalAnnEnabled: false, LocalAnnEnabled: false,
LocalAnnPort: 42123, LocalAnnPort: 42123,
LocalAnnMCAddr: "quux:3232", LocalAnnMCAddr: "quux:3232",
MaxSendKbps: 1234, MaxSendKbps: 1234,
MaxRecvKbps: 2341, MaxRecvKbps: 2341,
ReconnectIntervalS: 6000, ReconnectIntervalS: 6000,
StartBrowser: false, StartBrowser: false,
UPnPEnabled: false, UPnPEnabled: false,
UPnPLease: 60, UPnPLease: 60,
UPnPRenewal: 15, UPnPRenewal: 15,
RestartOnWakeup: false, RestartOnWakeup: false,
AutoUpgradeIntervalH: 24,
} }
cfg, err := Load("testdata/overridenvalues.xml", device1) cfg, err := Load("testdata/overridenvalues.xml", device1)

View File

@ -16,5 +16,6 @@
<upnpLeaseMinutes>60</upnpLeaseMinutes> <upnpLeaseMinutes>60</upnpLeaseMinutes>
<upnpRenewalMinutes>15</upnpRenewalMinutes> <upnpRenewalMinutes>15</upnpRenewalMinutes>
<restartOnWakeup>false</restartOnWakeup> <restartOnWakeup>false</restartOnWakeup>
<autoUpgradeIntervalH>24</autoUpgradeIntervalH>
</options> </options>
</configuration> </configuration>

0
internal/model/testdata/.stignore vendored Executable file → Normal file
View File