diff options
author | Jakob Borg <jakob@kastelo.net> | 2018-06-08 12:38:00 +0200 |
---|---|---|
committer | Jakob Borg <jakob@kastelo.net> | 2018-06-08 12:39:17 +0200 |
commit | 4781e1d86f0b87ee40822d614ddb73c768b9b4ae (patch) | |
tree | 3400a27a4b12c00dd1b5928cfd10c2527f10895f /test | |
parent | a467f6908c4ffd900e6ca8f081cf0436f20c6365 (diff) | |
download | syncthing-4781e1d86f0b87ee40822d614ddb73c768b9b4ae.tar.gz syncthing-4781e1d86f0b87ee40822d614ddb73c768b9b4ae.zip |
test: Migrate test configs to current version
Diffstat (limited to 'test')
-rw-r--r-- | test/h1/config.xml | 15 | ||||
-rw-r--r-- | test/h2/config.xml | 12 | ||||
-rw-r--r-- | test/h3/config.xml | 11 | ||||
-rw-r--r-- | test/h4/config.xml | 8 |
4 files changed, 37 insertions, 9 deletions
diff --git a/test/h1/config.xml b/test/h1/config.xml index 418d253a5..606b069d5 100644 --- a/test/h1/config.xml +++ b/test/h1/config.xml @@ -1,4 +1,4 @@ -<configuration version="26"> +<configuration version="28"> <folder id="default" label="" path="s1/" type="readwrite" rescanIntervalS="10" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true"> <filesystemType>basic</filesystemType> <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device> @@ -8,6 +8,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -28,6 +29,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -45,26 +47,36 @@ <address>tcp://127.0.0.1:22004</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" name="s1" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22001</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22002</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22003</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" name="s4" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22004</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <gui enabled="true" tls="false" debugging="true"> <address>127.0.0.1:8081</address> @@ -108,7 +120,6 @@ <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect> <tempIndexMinBlocks>10</tempIndexMinBlocks> <trafficClass>0</trafficClass> - <weakHashSelectionMethod>auto</weakHashSelectionMethod> <defaultFolderPath>~</defaultFolderPath> <setLowPriority>true</setLowPriority> <minHomeDiskFreePct>0</minHomeDiskFreePct> diff --git a/test/h2/config.xml b/test/h2/config.xml index a5d21e274..9c6dd4feb 100644 --- a/test/h2/config.xml +++ b/test/h2/config.xml @@ -1,4 +1,4 @@ -<configuration version="26"> +<configuration version="28"> <folder id="default" label="" path="s2" type="readwrite" rescanIntervalS="15" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true"> <filesystemType>basic</filesystemType> <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device> @@ -7,6 +7,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -27,6 +28,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -47,6 +49,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -64,16 +67,22 @@ <address>tcp://127.0.0.1:22001</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22002</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22003</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <gui enabled="true" tls="false" debugging="true"> <address>127.0.0.1:8082</address> @@ -116,7 +125,6 @@ <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect> <tempIndexMinBlocks>10</tempIndexMinBlocks> <trafficClass>0</trafficClass> - <weakHashSelectionMethod>auto</weakHashSelectionMethod> <defaultFolderPath>~</defaultFolderPath> <setLowPriority>true</setLowPriority> <minHomeDiskFreePct>0</minHomeDiskFreePct> diff --git a/test/h3/config.xml b/test/h3/config.xml index a204db7d4..7cad3d398 100644 --- a/test/h3/config.xml +++ b/test/h3/config.xml @@ -1,4 +1,4 @@ -<configuration version="26"> +<configuration version="28"> <folder id="default" label="" path="s3" type="readwrite" rescanIntervalS="20" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true"> <filesystemType>basic</filesystemType> <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU" introducedBy=""></device> @@ -9,6 +9,7 @@ <param key="keep" val="5"></param> </versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -29,6 +30,7 @@ <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> + <pullerMaxPendingKiB>0</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -46,16 +48,22 @@ <address>tcp://127.0.0.1:22001</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="MRIW7OK-NETT3M4-N6SBWME-N25O76W-YJKVXPH-FUMQJ3S-P57B74J-GBITBAC" name="s2" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22002</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU" name="s3" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>tcp://127.0.0.1:22003</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <gui enabled="true" tls="false" debugging="true"> <address>127.0.0.1:8083</address> @@ -98,7 +106,6 @@ <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect> <tempIndexMinBlocks>10</tempIndexMinBlocks> <trafficClass>0</trafficClass> - <weakHashSelectionMethod>auto</weakHashSelectionMethod> <defaultFolderPath>~</defaultFolderPath> <setLowPriority>true</setLowPriority> <minHomeDiskFreePct>0</minHomeDiskFreePct> diff --git a/test/h4/config.xml b/test/h4/config.xml index 647c9b5e2..9b2a272e5 100644 --- a/test/h4/config.xml +++ b/test/h4/config.xml @@ -1,11 +1,11 @@ -<configuration version="26"> +<configuration version="28"> <folder id="default" label="" path="s4/" type="readwrite" rescanIntervalS="60" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="false"> <filesystemType>basic</filesystemType> <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" introducedBy=""></device> <minDiskFree unit="%">1</minDiskFree> <versioning></versioning> <copiers>1</copiers> - <pullers>16</pullers> + <pullerMaxPendingKiB>2048</pullerMaxPendingKiB> <hashers>0</hashers> <order>random</order> <ignoreDelete>false</ignoreDelete> @@ -17,11 +17,14 @@ <paused>false</paused> <weakHashThresholdPct>25</weakHashThresholdPct> <markerName>.stfolder</markerName> + <useLargeBlocks>false</useLargeBlocks> </folder> <device id="7PBCTLL-JJRYBSA-MOWZRKL-MSDMN4N-4US4OMX-SYEXUS4-HSBGNRY-CZXRXAT" name="s4" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy=""> <address>dynamic</address> <paused>false</paused> <autoAcceptFolders>false</autoAcceptFolders> + <maxSendKbps>0</maxSendKbps> + <maxRecvKbps>0</maxRecvKbps> </device> <gui enabled="true" tls="false" debugging="true"> <address>127.0.0.1:8084</address> @@ -64,7 +67,6 @@ <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect> <tempIndexMinBlocks>10</tempIndexMinBlocks> <trafficClass>0</trafficClass> - <weakHashSelectionMethod>auto</weakHashSelectionMethod> <defaultFolderPath>~</defaultFolderPath> <setLowPriority>true</setLowPriority> <minHomeDiskFreePct>0</minHomeDiskFreePct> |