diff --git a/test/filetype_test.go b/test/filetype_test.go
index fe6988332..922892716 100644
--- a/test/filetype_test.go
+++ b/test/filetype_test.go
@@ -25,6 +25,8 @@ func TestFileTypeChange(t *testing.T) {
fld := cfg.Folders()["default"]
fld.Versioning = config.VersioningConfiguration{}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testFileTypeChange(t)
@@ -40,6 +42,8 @@ func TestFileTypeChangeSimpleVersioning(t *testing.T) {
Params: map[string]string{"keep": "5"},
}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testFileTypeChange(t)
@@ -54,6 +58,8 @@ func TestFileTypeChangeStaggeredVersioning(t *testing.T) {
Type: "staggered",
}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testFileTypeChange(t)
diff --git a/test/h1/config.xml b/test/h1/config.xml
index 606b069d5..5bd47cc87 100644
--- a/test/h1/config.xml
+++ b/test/h1/config.xml
@@ -1,5 +1,5 @@
-
+
basic
@@ -22,7 +22,7 @@
.stfolder
true
-
+
basic
@@ -49,6 +49,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22001
@@ -56,6 +57,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22002
@@ -63,6 +65,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22003
@@ -70,6 +73,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22004
@@ -77,6 +81,7 @@
false
0
0
+ 0
127.0.0.1:8081
@@ -85,6 +90,7 @@
abc123
default
+
tcp://127.0.0.1:22001
default
@@ -122,6 +128,7 @@
0
~
true
+ 0
0
diff --git a/test/h2/config.xml b/test/h2/config.xml
index 9c6dd4feb..ac49499fd 100644
--- a/test/h2/config.xml
+++ b/test/h2/config.xml
@@ -1,5 +1,5 @@
-
+
basic
@@ -21,7 +21,7 @@
.stfolder
true
-
+
basic
@@ -42,7 +42,7 @@
.stfolder
true
-
+
basic
@@ -69,6 +69,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22002
@@ -76,6 +77,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22003
@@ -83,12 +85,14 @@
false
0
0
+ 0
127.0.0.1:8082
abc123
default
+
dynamic+https://relays.syncthing.net/endpoint
tcp://127.0.0.1:22002
@@ -127,6 +131,7 @@
0
~
true
+ 0
0
diff --git a/test/h3/config.xml b/test/h3/config.xml
index 7cad3d398..e29e22e85 100644
--- a/test/h3/config.xml
+++ b/test/h3/config.xml
@@ -1,5 +1,5 @@
-
+
basic
@@ -23,7 +23,7 @@
.stfolder
true
-
+
basic
@@ -50,6 +50,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22002
@@ -57,6 +58,7 @@
false
0
0
+ 0
tcp://127.0.0.1:22003
@@ -64,12 +66,14 @@
false
0
0
+ 0
127.0.0.1:8083
abc123
default
+
dynamic+https://relays.syncthing.net/endpoint
tcp://127.0.0.1:22003
@@ -108,6 +112,7 @@
0
~
true
+ 0
0
diff --git a/test/override_test.go b/test/override_test.go
index 01ea3c3a9..fe764176e 100644
--- a/test/override_test.go
+++ b/test/override_test.go
@@ -28,8 +28,8 @@ func TestOverride(t *testing.T) {
fld := cfg.Folders()["default"]
fld.Type = config.FolderTypeSendOnly
cfg.SetFolder(fld)
- os.Rename("h1/config.xml", "h1/config.xml.orig")
- defer os.Rename("h1/config.xml.orig", "h1/config.xml")
+ t.Log(os.Rename("h1/config.xml", "h1/config.xml.orig"))
+ defer t.Log(os.Rename("h1/config.xml.orig", "h1/config.xml"))
cfg.Save()
log.Println("Cleaning...")
diff --git a/test/symlink_test.go b/test/symlink_test.go
index 8dab012f4..282db30f7 100644
--- a/test/symlink_test.go
+++ b/test/symlink_test.go
@@ -29,6 +29,8 @@ func TestSymlinks(t *testing.T) {
fld := cfg.Folders()["default"]
fld.Versioning = config.VersioningConfiguration{}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testSymlinks(t)
@@ -48,6 +50,8 @@ func TestSymlinksSimpleVersioning(t *testing.T) {
Params: map[string]string{"keep": "5"},
}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testSymlinks(t)
@@ -66,6 +70,8 @@ func TestSymlinksStaggeredVersioning(t *testing.T) {
Type: "staggered",
}
cfg.SetFolder(fld)
+ os.Rename("h2/config.xml", "h2/config.xml.orig")
+ defer os.Rename("h2/config.xml.orig", "h2/config.xml")
cfg.Save()
testSymlinks(t)