tree faff560952230d78230f6c38a6a9ea3c3f195d93
parent ce49ae1fc3572480a8e0dfaa71cc96b40df7f51c
author Jatin Lodhia <jlodhia@google.com> 1452219435 -0800
committer Jatin Lodhia <jlodhia@google.com> 1452219441 -0800

Fix flakyness of Conflict Resolution integration tests.

* OnConflict can be called 3X times the expected number
  instead of 2X due to watcher of one syncbase lagging
  behind.
* When the load on a machine is high, tests take longer
  to finish. Increasing timeouts from 5 sec to 10 sec.

Bug: https://github.com/vanadium/issues/issues/1027
Bug: https://github.com/vanadium/issues/issues/1013

Change-Id: I980cb77efc96b1a6dffec4f258810f3276cb2d91