From 7ebdb1736f319e62a53143b9b28bd8f79d6fb57c Mon Sep 17 00:00:00 2001 From: Lode Hoste Date: Thu, 30 Jul 2015 18:03:00 +0200 Subject: [PATCH] Properly rename config files during integration tests (fixes #1769) --- test/norestart_test.go | 6 +++--- test/override_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/norestart_test.go b/test/norestart_test.go index 0919bf2b..680f4e5c 100644 --- a/test/norestart_test.go +++ b/test/norestart_test.go @@ -50,7 +50,7 @@ func TestAddDeviceWithoutRestart(t *testing.T) { os.Remove("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() if err != nil { @@ -117,7 +117,7 @@ func TestFolderWithoutRestart(t *testing.T) { os.Remove("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() if err != nil { @@ -154,7 +154,7 @@ func TestFolderWithoutRestart(t *testing.T) { os.Remove("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() if err != nil { diff --git a/test/override_test.go b/test/override_test.go index d732850d..94c7b853 100644 --- a/test/override_test.go +++ b/test/override_test.go @@ -29,7 +29,7 @@ func TestOverride(t *testing.T) { fld.ReadOnly = true cfg.SetFolder(fld) 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() log.Println("Cleaning...") @@ -158,7 +158,7 @@ func TestOverrideIgnores(t *testing.T) { fld.ReadOnly = true cfg.SetFolder(fld) 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() log.Println("Cleaning...")