From 739c525a9836a4a010d4331ffc7e0f7e0c08b5d1 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sat, 4 Apr 2015 22:55:24 +0200
Subject: [PATCH] model: TestIgnores should not randomly fail

---
 internal/model/.gitignore    | 2 ++
 internal/model/model_test.go | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 internal/model/.gitignore

diff --git a/internal/model/.gitignore b/internal/model/.gitignore
new file mode 100644
index 00000000..e4883156
--- /dev/null
+++ b/internal/model/.gitignore
@@ -0,0 +1,2 @@
+.stfolder
+.stignore
diff --git a/internal/model/model_test.go b/internal/model/model_test.go
index 9ee12d25..8b900f0d 100644
--- a/internal/model/model_test.go
+++ b/internal/model/model_test.go
@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"math/rand"
 	"os"
 	"path/filepath"
@@ -49,6 +50,10 @@ func init() {
 				DeviceID: device1,
 			},
 		},
+		Options: config.OptionsConfiguration{
+			// Don't remove temporaries directly on startup
+			KeepTemporariesH: 1,
+		},
 	}
 	defaultConfig = config.Wrap("/tmp/test", _defaultConfig)
 }
@@ -469,6 +474,9 @@ func TestIgnores(t *testing.T) {
 		return true
 	}
 
+	// Assure a clean start state
+	ioutil.WriteFile("testdata/.stignore", []byte(".*\nquux\n"), 0644)
+
 	db, _ := leveldb.Open(storage.NewMemStorage(), nil)
 	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db)
 	m.AddFolder(defaultFolderConfig)
@@ -989,7 +997,6 @@ func TestGlobalDirectoryTree(t *testing.T) {
 }
 
 func TestGlobalDirectorySelfFixing(t *testing.T) {
-
 	db, _ := leveldb.Open(storage.NewMemStorage(), nil)
 	m := NewModel(defaultConfig, protocol.LocalDeviceID, "device", "syncthing", "dev", db)
 	m.AddFolder(defaultFolderConfig)