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

Properly rename config files during integration tests (fixes #1769)

Browse Source
This commit is contained in:
Lode Hoste 2015-07-30 18:03:00 +02:00 committed by Jakob Borg
parent 19451e0654
commit 7ebdb1736f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/norestart_test.go
View File

@ -50,7 +50,7 @@ func TestAddDeviceWithoutRestart(t *testing.T) {
os.Remove("h4/config.xml.orig") os.Remove("h4/config.xml.orig")
os.Rename("h4/config.xml", "h4/config.xml.orig") os.Rename("h4/config.xml", "h4/config.xml.orig")
defer os.Rename("h4/config.xml.orig", "h4/config.xml") defer osutil.Rename("h4/config.xml.orig", "h4/config.xml")
cfg, err := p4.GetConfig() cfg, err := p4.GetConfig()
if err != nil { if err != nil {
@ -117,7 +117,7 @@ func TestFolderWithoutRestart(t *testing.T) {
os.Remove("h1/config.xml.orig") os.Remove("h1/config.xml.orig")
os.Rename("h1/config.xml", "h1/config.xml.orig") os.Rename("h1/config.xml", "h1/config.xml.orig")
defer os.Rename("h1/config.xml.orig", "h1/config.xml") defer osutil.Rename("h1/config.xml.orig", "h1/config.xml")
cfg, err := p1.GetConfig() cfg, err := p1.GetConfig()
if err != nil { if err != nil {
@ -154,7 +154,7 @@ func TestFolderWithoutRestart(t *testing.T) {
os.Remove("h4/config.xml.orig") os.Remove("h4/config.xml.orig")
os.Rename("h4/config.xml", "h4/config.xml.orig") os.Rename("h4/config.xml", "h4/config.xml.orig")
defer os.Rename("h4/config.xml.orig", "h4/config.xml") defer osutil.Rename("h4/config.xml.orig", "h4/config.xml")
cfg, err = p4.GetConfig() cfg, err = p4.GetConfig()
if err != nil { if err != nil {

4
test/override_test.go
View File

@ -29,7 +29,7 @@ func TestOverride(t *testing.T) {
fld.ReadOnly = true fld.ReadOnly = true
cfg.SetFolder(fld) cfg.SetFolder(fld)
os.Rename("h1/config.xml", "h1/config.xml.orig") os.Rename("h1/config.xml", "h1/config.xml.orig")
defer os.Rename("h1/config.xml.orig", "h1/config.xml") defer osutil.Rename("h1/config.xml.orig", "h1/config.xml")
cfg.Save() cfg.Save()
log.Println("Cleaning...") log.Println("Cleaning...")
@ -158,7 +158,7 @@ func TestOverrideIgnores(t *testing.T) {
fld.ReadOnly = true fld.ReadOnly = true
cfg.SetFolder(fld) cfg.SetFolder(fld)
os.Rename("h1/config.xml", "h1/config.xml.orig") os.Rename("h1/config.xml", "h1/config.xml.orig")
defer os.Rename("h1/config.xml.orig", "h1/config.xml") defer osutil.Rename("h1/config.xml.orig", "h1/config.xml")
cfg.Save() cfg.Save()
log.Println("Cleaning...") log.Println("Cleaning...")