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

all: Automatic/disabled folder-config when receive-encrypted (#7327)

Browse Source
This commit is contained in:
Simon Frei
2021-02-12 22:51:29 +01:00
committed by GitHub
parent 7e4e2f3720
commit 80fc238bec
13 changed files with 221 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/model_test.go
+2 -2
View File
@@ -4177,7 +4177,7 @@ func TestPendingFolder(t *testing.T) {
setDevice(t, w, config.DeviceConfiguration{DeviceID: device2})
pfolder := "default"
if err := m.db.AddOrUpdatePendingFolder(pfolder, pfolder, device2); err != nil {
if err := m.db.AddOrUpdatePendingFolder(pfolder, pfolder, device2, false); err != nil {
t.Fatal(err)
}
deviceFolders, err := m.PendingFolders(protocol.EmptyDeviceID)
@@ -4193,7 +4193,7 @@ func TestPendingFolder(t *testing.T) {
device3, err := protocol.DeviceIDFromString("AIBAEAQ-CAIBAEC-AQCAIBA-EAQCAIA-BAEAQCA-IBAEAQC-CAIBAEA-QCAIBA7")
setDevice(t, w, config.DeviceConfiguration{DeviceID: device3})
if err := m.db.AddOrUpdatePendingFolder(pfolder, pfolder, device3); err != nil {
if err := m.db.AddOrUpdatePendingFolder(pfolder, pfolder, device3, false); err != nil {
t.Fatal(err)
}
deviceFolders, err = m.PendingFolders(device2)