Simon Frei bc53782f88 test: Update conflict integration test (ref #5511) (#5618) ... The change in 225c0dda80 (#5511) results in conflicts being immediately scanned and synced, while the test expects just one conflict on either side. Change it to expect the same conflict on both sides.		2019-03-25 12:53:06 +01:00
..
h1	test: Update configs and revert changes during testing (#5393)	2018-12-21 11:50:28 +01:00
h2	test: Update configs and revert changes during testing (#5393)	2018-12-21 11:50:28 +01:00
h3	test: Update configs and revert changes during testing (#5393)	2018-12-21 11:50:28 +01:00
h4	test: Migrate test configs to current version	2018-06-08 12:39:17 +02:00
logs	Improvements to integration tests	2015-01-22 00:18:08 +00:00
.gitignore	Add devices without restart (fixes #2083)	2015-07-22 10:43:47 +02:00
cli_test.go	test: Clean & unflake cli & conflict tests	2017-11-13 01:06:16 +01:00
conflict_test.go	test: Update conflict integration test (ref #5511) (#5618)	2019-03-25 12:53:06 +01:00
delay_scan_test.go	all: Update license url to https (ref #3976)	2017-02-09 08:04:16 +01:00
filetype_test.go	test: Update configs and revert changes during testing (#5393)	2018-12-21 11:50:28 +01:00
http_test.go	test: Clean & unflake HTTP / filetype tests	2017-11-13 01:00:49 +01:00
ignore_test.go	test: Clean and unflake ignore / manupeers / reconnect / override tests	2017-11-13 01:00:36 +01:00
manypeers_test.go	test: Clean and unflake ignore / manupeers / reconnect / override tests	2017-11-13 01:00:36 +01:00
override_test.go	test, lib/rc: Integration test fixes and polish (#5488)	2019-01-29 16:59:00 +01:00
parallell_scan_test.go	all: Update license url to https (ref #3976)	2017-02-09 08:04:16 +01:00
reconnect_test.go	lib/model: Properly schedule pull on reconnect (fixes #4504)	2017-11-17 12:11:45 +00:00
reset_test.go	lib/model: Properly schedule pull on reconnect (fixes #4504)	2017-11-17 12:11:45 +00:00
scan_test.go	test: Unflake symlink/scan tests	2017-11-13 00:25:07 +01:00
symlink_test.go	test: Update configs and revert changes during testing (#5393)	2018-12-21 11:50:28 +01:00
sync_test.go	lib/model: Properly schedule pull on reconnect (fixes #4504)	2017-11-17 12:11:45 +00:00
transfer-bench_test.go	test: Mend the transfer benchmark	2018-02-03 10:29:05 +01:00
usage_unix.go	lib/connections: Add KCP support (fixes #804)	2017-03-07 12:44:16 +00:00
usage_windows.go	lib/connections: Add KCP support (fixes #804)	2017-03-07 12:44:16 +00:00
util.go	all: Revert the underscore sillyness	2019-02-02 12:16:27 +01:00