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

lib/model: Consistently cleanup model in tests (#5724)

Browse Source
This commit is contained in:
Simon Frei
2019-05-19 14:29:07 +02:00
committed by GitHub
parent f593ac387c
commit 5b306510a0
4 changed files with 178 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/model/folder_recvonly_test.go
View File

@@ -10,7 +10,6 @@ import (
"bytes"
"context"
"io/ioutil"
"os"
"path/filepath"
"testing"
"time"
@@ -30,10 +29,7 @@ func TestRecvOnlyRevertDeletes(t *testing.T) {
m, f := setupROFolder()
ffs := f.Filesystem()
defer os.Remove(m.cfg.ConfigPath())
defer os.Remove(ffs.URI())
defer m.db.Close()
defer m.Stop()
defer cleanupModelAndRemoveDir(m, ffs.URI())
// Create some test data
@@ -114,10 +110,7 @@ func TestRecvOnlyRevertNeeds(t *testing.T) {
m, f := setupROFolder()
ffs := f.Filesystem()
defer os.Remove(m.cfg.ConfigPath())
defer os.Remove(ffs.URI())
defer m.db.Close()
defer m.Stop()
defer cleanupModelAndRemoveDir(m, ffs.URI())
// Create some test data
@@ -208,10 +201,7 @@ func TestRecvOnlyUndoChanges(t *testing.T) {
m, f := setupROFolder()
ffs := f.Filesystem()
defer os.Remove(m.cfg.ConfigPath())
defer os.Remove(ffs.URI())
defer m.db.Close()
defer m.Stop()
defer cleanupModelAndRemoveDir(m, ffs.URI())
// Create some test data