From 80031c59da2992f47a80c044a28aeca18f9d7bd3 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 13 Nov 2017 01:06:16 +0100 Subject: [PATCH] test: Clean & unflake cli & conflict tests --- test/cli_test.go | 4 ++-- test/conflict_test.go | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/cli_test.go b/test/cli_test.go index 2fe31243f..495bf9f8a 100644 --- a/test/cli_test.go +++ b/test/cli_test.go @@ -17,7 +17,7 @@ import ( ) func TestCLIReset(t *testing.T) { - dirs := []string{"h1/index-v0.11.0.db"} + dirs := []string{"h1/index-v0.14.0.db"} // Create directories that reset will remove @@ -30,7 +30,7 @@ func TestCLIReset(t *testing.T) { // Run reset to clean up - cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "h1", "-reset") + cmd := exec.Command("../bin/syncthing", "-no-browser", "-home", "h1", "-reset-database") cmd.Stdout = os.Stdout cmd.Stderr = os.Stdout err := cmd.Run() diff --git a/test/conflict_test.go b/test/conflict_test.go index 8cd61a5c9..bd749e76c 100644 --- a/test/conflict_test.go +++ b/test/conflict_test.go @@ -56,6 +56,9 @@ func TestConflictsDefault(t *testing.T) { receiver := startInstance(t, 2) defer checkedStop(t, receiver) + sender.ResumeAll() + receiver.ResumeAll() + // Rescan with a delay on the next one, so we are not surprised by a // sudden rescan while we're trying to introduce conflicts. @@ -242,6 +245,9 @@ func TestConflictsInitialMerge(t *testing.T) { receiver := startInstance(t, 2) defer checkedStop(t, receiver) + sender.ResumeAll() + receiver.ResumeAll() + log.Println("Syncing...") rc.AwaitSync("default", sender, receiver) @@ -320,6 +326,9 @@ func TestConflictsIndexReset(t *testing.T) { receiver := startInstance(t, 2) defer checkedStop(t, receiver) + sender.ResumeAll() + receiver.ResumeAll() + log.Println("Syncing...") rc.AwaitSync("default", sender, receiver)