diff options
| author | Jakob Borg <jakob@kastelo.net> | 2017-11-13 00:24:14 +0100 |
|---|---|---|
| committer | Jakob Borg <jakob@kastelo.net> | 2017-11-13 00:25:07 +0100 |
| commit | d8a0a477cacfed8d08589c65b9b735b8c6295289 (patch) | |
| tree | ad1494220450116c8beb43626757c9705da4b78f /test | |
| parent | 6dd6ecde953cda41b2771fe42356ff75d880fca4 (diff) | |
| download | syncthing-d8a0a477cacfed8d08589c65b9b735b8c6295289.tar.gz syncthing-d8a0a477cacfed8d08589c65b9b735b8c6295289.zip | |
test: Unflake symlink/scan tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/h3/config.xml | 2 | ||||
| -rw-r--r-- | test/scan_test.go | 7 | ||||
| -rw-r--r-- | test/symlink_test.go | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/test/h3/config.xml b/test/h3/config.xml index 1860748c2..3e6bce97e 100644 --- a/test/h3/config.xml +++ b/test/h3/config.xml @@ -79,7 +79,7 @@ <natTimeoutSeconds>10</natTimeoutSeconds> <urAccepted>-1</urAccepted> <urSeen>2</urSeen> - <urUniqueID></urUniqueID> + <urUniqueID>UL4yowgK</urUniqueID> <urURL>https://data.syncthing.net/newdata</urURL> <urPostInsecurely>false</urPostInsecurely> <urInitialDelayS>1800</urInitialDelayS> diff --git a/test/scan_test.go b/test/scan_test.go index 93ed0b49c..e2ebbb6da 100644 --- a/test/scan_test.go +++ b/test/scan_test.go @@ -16,7 +16,7 @@ import ( "github.com/syncthing/syncthing/lib/rc" ) -func TestSubScan(t *testing.T) { +func TestScanSubdir(t *testing.T) { log.Println("Cleaning...") err := removeAll("s1", "s2", "h1/index*", "h2/index*") if err != nil { @@ -40,8 +40,13 @@ func TestSubScan(t *testing.T) { // Verify that the files and directories sync to the other side sender := startInstance(t, 1) defer checkedStop(t, sender) + receiver := startInstance(t, 2) defer checkedStop(t, receiver) + + sender.ResumeAll() + receiver.ResumeAll() + log.Println("Syncing...") rc.AwaitSync("default", sender, receiver) diff --git a/test/symlink_test.go b/test/symlink_test.go index 424ee8322..8dab012f4 100644 --- a/test/symlink_test.go +++ b/test/symlink_test.go @@ -158,6 +158,9 @@ func testSymlinks(t *testing.T) { receiver := startInstance(t, 2) defer checkedStop(t, receiver) + sender.ResumeAll() + receiver.ResumeAll() + log.Println("Syncing...") rc.AwaitSync("default", sender, receiver) |