perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Relax folder label restrictions

Browse Source
This commit is contained in:
Jakob Borg
2015-09-24 19:51:59 +02:00
parent 43189dfe3a
commit e0a16e08dd
10 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/h1/config.xml
View File

@@ -12,7 +12,7 @@
<order>random</order>
<ignoreDelete>false</ignoreDelete>
</folder>
<folder id="s12" path="s12-1" ro="false" rescanIntervalS="10" ignorePerms="false" autoNormalize="true">
<folder id="¯\_(ツ)_/¯ Räksmörgås 动作 Адрес" path="s12-1" ro="false" rescanIntervalS="10" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<minDiskFreePct>1</minDiskFreePct>

2
test/h2/config.xml
View File

@@ -14,7 +14,7 @@
<ignoreDelete>false</ignoreDelete>
<scanProgressInterval>0</scanProgressInterval>
</folder>
<folder id="s12" path="s12-2" ro="false" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
<folder id="¯\_(ツ)_/¯ Räksmörgås 动作 Адрес" path="s12-2" ro="false" rescanIntervalS="15" ignorePerms="false" autoNormalize="true">
<device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
<device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
<minDiskFreePct>1</minDiskFreePct>

5
test/sync_test.go
View File

@@ -25,6 +25,7 @@ import (
const (
longTimeLimit = 5 * time.Minute
shortTimeLimit = 45 * time.Second
s12Folder = `¯\_(ツ)_/¯ Räksmörgås 动作 Адрес` // This was renamed to ensure arbitrary folder IDs are fine.
)
func TestSyncClusterWithoutVersioning(t *testing.T) {
@@ -220,7 +221,7 @@ func testSyncCluster(t *testing.T) {
t.Fatal(err)
}
if i == 0 || i == 1 {
if err := device.RescanDelay("s12", 86400); err != nil {
if err := device.RescanDelay(s12Folder, 86400); err != nil {
t.Fatal(err)
}
}
@@ -418,7 +419,7 @@ func scSyncAndCompare(p []*rc.Process, expected [][]fileInfo) error {
if !rc.InSync("default", p...) {
continue
}
if !rc.InSync("s12", p[0], p[1]) {
if !rc.InSync(s12Folder, p[0], p[1]) {
continue
}
if !rc.InSync("s23", p[1], p[2]) {