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

Change integration test "log" field to "instance"

Browse Source
This commit is contained in:
Jakob Borg 2015-01-11 09:26:20 +01:00
parent 571cf7d490
commit d4d391b34f
10 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/filetype_test.go
View File

@ -101,7 +101,7 @@ func testFileTypeChange(t *testing.T) {
log.Println("Syncing...") log.Println("Syncing...")
sender := syncthingProcess{ // id1 sender := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,
@ -112,7 +112,7 @@ func testFileTypeChange(t *testing.T) {
} }
receiver := syncthingProcess{ // id2 receiver := syncthingProcess{ // id2
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,

8
test/http_test.go
View File

@ -43,7 +43,7 @@ func TestGetIndex(t *testing.T) {
st := syncthingProcess{ st := syncthingProcess{
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
log: "2.out", instance: "2",
} }
err := st.start() err := st.start()
if err != nil { if err != nil {
@ -86,7 +86,7 @@ func TestGetIndexAuth(t *testing.T) {
st := syncthingProcess{ st := syncthingProcess{
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
log: "1.out", instance: "1",
} }
err := st.start() err := st.start()
if err != nil { if err != nil {
@ -144,7 +144,7 @@ func TestGetJSON(t *testing.T) {
st := syncthingProcess{ st := syncthingProcess{
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
log: "2.out", instance: "2",
} }
err := st.start() err := st.start()
if err != nil { if err != nil {
@ -176,7 +176,7 @@ func TestPOSTWithoutCSRF(t *testing.T) {
st := syncthingProcess{ st := syncthingProcess{
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
log: "2.out", instance: "2",
} }
err := st.start() err := st.start()
if err != nil { if err != nil {

2
test/httpstress_test.go
View File

@ -39,7 +39,7 @@ func TestStressHTTP(t *testing.T) {
log.Println("Starting up...") log.Println("Starting up...")
sender := syncthingProcess{ // id1 sender := syncthingProcess{ // id1
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,

2
test/ignore_test.go
View File

@ -36,7 +36,7 @@ func TestIgnores(t *testing.T) {
} }
p := syncthingProcess{ // id1 p := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,

4
test/manypeers_test.go
View File

@ -43,7 +43,7 @@ func TestManyPeers(t *testing.T) {
} }
receiver := syncthingProcess{ // id2 receiver := syncthingProcess{ // id2
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,
@ -90,7 +90,7 @@ func TestManyPeers(t *testing.T) {
log.Println("Starting up...") log.Println("Starting up...")
sender := syncthingProcess{ // id1 sender := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,

2
test/parallell_scan_test.go
View File

@ -46,7 +46,7 @@ func TestParallellScan(t *testing.T) {
log.Println("Starting up...") log.Println("Starting up...")
st := syncthingProcess{ // id1 st := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,

4
test/reconnect_test.go
View File

@ -54,7 +54,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
log.Println("Starting up...") log.Println("Starting up...")
sender := syncthingProcess{ // id1 sender := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,
@ -65,7 +65,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
} }
receiver := syncthingProcess{ // id2 receiver := syncthingProcess{ // id2
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,

4
test/symlink_test.go
View File

@ -177,7 +177,7 @@ func testSymlinks(t *testing.T) {
log.Println("Syncing...") log.Println("Syncing...")
sender := syncthingProcess{ // id1 sender := syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,
@ -188,7 +188,7 @@ func testSymlinks(t *testing.T) {
} }
receiver := syncthingProcess{ // id2 receiver := syncthingProcess{ // id2
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,

6
test/sync_test.go
View File

@ -254,7 +254,7 @@ func scStartProcesses() ([]syncthingProcess, error) {
p := make([]syncthingProcess, 3) p := make([]syncthingProcess, 3)
p[0] = syncthingProcess{ // id1 p[0] = syncthingProcess{ // id1
log: "1.out", instance: "1",
argv: []string{"-home", "h1"}, argv: []string{"-home", "h1"},
port: 8081, port: 8081,
apiKey: apiKey, apiKey: apiKey,
@ -265,7 +265,7 @@ func scStartProcesses() ([]syncthingProcess, error) {
} }
p[1] = syncthingProcess{ // id2 p[1] = syncthingProcess{ // id2
log: "2.out", instance: "2",
argv: []string{"-home", "h2"}, argv: []string{"-home", "h2"},
port: 8082, port: 8082,
apiKey: apiKey, apiKey: apiKey,
@ -277,7 +277,7 @@ func scStartProcesses() ([]syncthingProcess, error) {
} }
p[2] = syncthingProcess{ // id3 p[2] = syncthingProcess{ // id3
log: "3.out", instance: "3",
argv: []string{"-home", "h3"}, argv: []string{"-home", "h3"},
port: 8083, port: 8083,
apiKey: apiKey, apiKey: apiKey,

6
test/syncthingprocess.go
View File

@ -37,7 +37,7 @@ var env = []string{
} }
type syncthingProcess struct { type syncthingProcess struct {
log string instance string
argv []string argv []string
port int port int
apiKey string apiKey string
@ -50,7 +50,7 @@ type syncthingProcess struct {
func (p *syncthingProcess) start() error { func (p *syncthingProcess) start() error {
if p.logfd == nil { if p.logfd == nil {
logfd, err := os.Create(p.log) logfd, err := os.Create(p.instance + ".out")
if err != nil { if err != nil {
return err return err
} }
@ -82,7 +82,7 @@ func (p *syncthingProcess) stop() error {
p.cmd.Process.Signal(os.Kill) p.cmd.Process.Signal(os.Kill)
p.cmd.Wait() p.cmd.Wait()
fd, err := os.Open(p.log) fd, err := os.Open(p.instance + ".out")
if err != nil { if err != nil {
return err return err
} }