alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

fix darwin integration tests

Browse source
This commit is contained in:
Florian Weingarten 2015-07-09 11:13:40 -04:00
parent 775529f1ff
commit c2d5a9209e
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmd/restic/integration_helpers_test.go
View file

@ -5,6 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"syscall" "syscall"
"testing" "testing"
@ -55,25 +56,32 @@ func walkDir(dir string) <-chan *dirEntry {
func (e *dirEntry) equals(other *dirEntry) bool { func (e *dirEntry) equals(other *dirEntry) bool {
if e.path != other.path { if e.path != other.path {
fmt.Fprintf(os.Stderr, "%v: path does not match\n", e.path) fmt.Fprintf(os.Stderr, "%v: path does not match (%v != %v)\n", e.path, e.path, other.path)
return false return false
} }
if e.fi.Mode() != other.fi.Mode() { if e.fi.Mode() != other.fi.Mode() {
fmt.Fprintf(os.Stderr, "%v: mode does not match\n", e.path) fmt.Fprintf(os.Stderr, "%v: mode does not match (%v != %v)\n", e.path, e.fi.Mode(), other.fi.Mode())
return false return false
} }
if runtime.GOOS != "darwin" {
if e.fi.ModTime() != other.fi.ModTime() { if e.fi.ModTime() != other.fi.ModTime() {
fmt.Fprintf(os.Stderr, "%v: ModTime does not match\n", e.path) fmt.Fprintf(os.Stderr, "%v: ModTime does not match (%v != %v)\n", e.path, e.fi.ModTime(), other.fi.ModTime())
return false return false
} }
}
stat, _ := e.fi.Sys().(*syscall.Stat_t) stat, _ := e.fi.Sys().(*syscall.Stat_t)
stat2, _ := other.fi.Sys().(*syscall.Stat_t) stat2, _ := other.fi.Sys().(*syscall.Stat_t)
if stat.Uid != stat2.Uid || stat2.Gid != stat2.Gid { if stat.Uid != stat2.Uid {
fmt.Fprintf(os.Stderr, "%v: UID or GID do not match\n", e.path) fmt.Fprintf(os.Stderr, "%v: UID does not match (%v != %v)\n", e.path, stat.Uid, stat2.Uid)
return false
}
if stat.Gid != stat2.Gid {
fmt.Fprintf(os.Stderr, "%v: GID does not match (%v != %v)\n", e.path, stat.Gid, stat2.Gid)
return false return false
} }