diff options
| author | Håvard Haugen <havard.haugen@gmail.com> | 2015-04-23 23:59:36 +0200 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-05-11 04:19:29 +0000 |
| commit | dd3919343ed6ab8cad672c16b8c2a514615d9c4e (patch) | |
| tree | 5f706b432597f279fd3eb9acd0173e4fd016b9e8 /git-codereview/sync_test.go | |
| parent | af3758ca538112730b99a2ebb005eefba171b9a8 (diff) | |
| download | go-x-review-dd3919343ed6ab8cad672c16b8c2a514615d9c4e.tar.xz | |
git-codereview: deflake TestSyncRebase
In order to guarantee different hashes on "client" and "server" we need
to generate different commit histories.
Fixes golang/go#10048, updates golang/go#9602.
Change-Id: I42a50dc890598dd3a3b6c626c6db70ffe06c14d3
Reviewed-on: https://go-review.googlesource.com/9256
Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'git-codereview/sync_test.go')
| -rw-r--r-- | git-codereview/sync_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-codereview/sync_test.go b/git-codereview/sync_test.go index 2f7318d..88461b3 100644 --- a/git-codereview/sync_test.go +++ b/git-codereview/sync_test.go @@ -73,8 +73,10 @@ func TestSyncRebase(t *testing.T) { t.Fatalf("CL hashes changed during no-op sync") } - // submit first two CLs - gt.serverWork does same thing gt.work does, but on client + // submit first two CLs - gt.serverWork does same thing gt.work does, but on server + gt.serverWork(t) + gt.serverWorkUnrelated(t) // wedge in unrelated work to get different hashes gt.serverWork(t) testMain(t, "sync") |