TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use filepath when manipulating file paths (#2221)

Browse source 
Automatically submitted.
This commit is contained in:
Manuel Stocker 2018-10-21 15:59:37 +02:00 • committed by corbot[bot]
parent cf04223718
commit 4b1b0ec9e6
10 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugin/auto/watcher_test.go
View file

@ -2,7 +2,7 @@ package auto
import (
"os"
"path"
"path/filepath"
"regexp"
"testing"
)
@ -39,7 +39,7 @@ func TestWatcher(t *testing.T) {
}
// Now remove one file, rescan and see if it's gone.
if err := os.Remove(path.Join(tempdir, "db.example.com")); err != nil {
if err := os.Remove(filepath.Join(tempdir, "db.example.com")); err != nil {
t.Fatal(err)
}
@ -78,15 +78,15 @@ func TestSymlinks(t *testing.T) {
a.Walk()
// Now create a duplicate file in a subdirectory and repoint the symlink
if err := os.Remove(path.Join(tempdir, "db.example.com")); err != nil {
if err := os.Remove(filepath.Join(tempdir, "db.example.com")); err != nil {
t.Fatal(err)
}
dataDir := path.Join(tempdir, "..data")
dataDir := filepath.Join(tempdir, "..data")
if err = os.Mkdir(dataDir, 0755); err != nil {
t.Fatal(err)
}
newFile := path.Join(dataDir, "db.example.com")
if err = os.Symlink(path.Join(tempdir, "db.example.org"), newFile); err != nil {
newFile := filepath.Join(dataDir, "db.example.com")
if err = os.Symlink(filepath.Join(tempdir, "db.example.org"), newFile); err != nil {
t.Fatal(err)
}