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

lib/model: Introduce must test utility (#5586)

Browse Source 
* lib/model: Introduce must test utility

* nice
This commit is contained in:
Simon Frei
2019-03-09 19:45:36 +01:00
committed by Audrius Butkevicius
parent 27ff20faa3
commit 189e44488e
5 changed files with 58 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/model/folder_sendrecv_test.go
View File

@@ -79,18 +79,12 @@ func createFile(t *testing.T, name string, fs fs.Filesystem) protocol.FileInfo {
t.Helper()
f, err := fs.Create(name)
if err != nil {
t.Fatal(err)
}
must(t, err)
f.Close()
fi, err := fs.Stat(name)
if err != nil {
t.Fatal(err)
}
must(t, err)
file, err := scanner.CreateFileInfo(fi, name, fs)
if err != nil {
t.Fatal(err)
}
must(t, err)
return file
}
@@ -323,9 +317,7 @@ func TestWeakHash(t *testing.T) {
}
f, err := ffs.Create("weakhash")
if err != nil {
t.Fatal(err)
}
must(t, err)
defer f.Close()
_, err = io.CopyN(f, rand.Reader, size)
if err != nil {
@@ -652,23 +644,15 @@ func TestIssue3164(t *testing.T) {
ignDir := filepath.Join("issue3164", "oktodelete")
subDir := filepath.Join(ignDir, "foobar")
if err := ffs.MkdirAll(subDir, 0777); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile(filepath.Join(tmpDir, subDir, "file"), []byte("Hello"), 0644); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile(filepath.Join(tmpDir, ignDir, "file"), []byte("Hello"), 0644); err != nil {
t.Fatal(err)
}
must(t, ffs.MkdirAll(subDir, 0777))
must(t, ioutil.WriteFile(filepath.Join(tmpDir, subDir, "file"), []byte("Hello"), 0644))
must(t, ioutil.WriteFile(filepath.Join(tmpDir, ignDir, "file"), []byte("Hello"), 0644))
file := protocol.FileInfo{
Name: "issue3164",
}
matcher := ignore.New(ffs)
if err := matcher.Parse(bytes.NewBufferString("(?d)oktodelete"), ""); err != nil {
t.Fatal(err)
}
must(t, matcher.Parse(bytes.NewBufferString("(?d)oktodelete"), ""))
dbUpdateChan := make(chan dbUpdateJob, 1)
@@ -757,13 +741,9 @@ func TestDeleteIgnorePerms(t *testing.T) {
defer file.Close()
stat, err := file.Stat()
if err != nil {
t.Fatal(err)
}
must(t, err)
fi, err := scanner.CreateFileInfo(stat, name, ffs)
if err != nil {
t.Fatal(err)
}
must(t, err)
ffs.Chmod(name, 0600)
scanChan := make(chan string)
finished := make(chan struct{})
@@ -776,9 +756,7 @@ func TestDeleteIgnorePerms(t *testing.T) {
<-finished
case <-finished:
}
if err != nil {
t.Fatal(err)
}
must(t, err)
}
func TestCopyOwner(t *testing.T) {