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

test: Updates for fs/osutil package changes

Browse Source
This commit is contained in:
Jakob Borg
2017-11-05 10:05:18 +01:00
parent d7d45d8092
commit 72c5f2e5c6
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/override_test.go
View File

@@ -17,7 +17,6 @@ import (
"time"
"github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/rc"
)
@@ -30,7 +29,7 @@ func TestOverride(t *testing.T) {
fld.Type = config.FolderTypeSendOnly
cfg.SetFolder(fld)
os.Rename("h1/config.xml", "h1/config.xml.orig")
defer osutil.Rename("h1/config.xml.orig", "h1/config.xml")
defer os.Rename("h1/config.xml.orig", "h1/config.xml")
cfg.Save()
log.Println("Cleaning...")
@@ -159,7 +158,7 @@ func TestOverrideIgnores(t *testing.T) {
fld.ReadOnly = true
cfg.SetFolder(fld)
os.Rename("h1/config.xml", "h1/config.xml.orig")
defer osutil.Rename("h1/config.xml.orig", "h1/config.xml")
defer os.Rename("h1/config.xml.orig", "h1/config.xml")
cfg.Save()
log.Println("Cleaning...")