diff options
| author | Håvard Haugen <havard.haugen@gmail.com> | 2015-05-12 09:37:22 +0200 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-05-13 02:01:05 +0000 |
| commit | 6fe36b1731a93d7a2e092357415855e7e942d1c5 (patch) | |
| tree | 6d1c8c4cebdf5818ee43bce10fbba2f5bea805cb /git-codereview/sync_test.go | |
| parent | 03efa21267702524f5855fc842515cc6216b5408 (diff) | |
| download | go-x-review-6fe36b1731a93d7a2e092357415855e7e942d1c5.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: I511f517639230d7aca74b3d2ce3bfa6a2c299a5c
Reviewed-on: https://go-review.googlesource.com/9951
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") |