tree 01da528082cab42cc941f9f04fd7de0be465d329
parent de3a454d315f3940c1a793cb5284590e033e7dd0
author Gal Paikin <paiking@google.com> 1585571386 +0200
committer Gal Paikin <paiking@google.com> 1585573478 +0200

Fix flaky test in CreateMergePatchSet

ChangeIT#createMergePatchSet was flaky. For some reason, even though the patchset
was created, after the second creation (e.g previously line 3245) one of the
followings happened around 50% of the times:

1. changeInfo.revisions contained 3 revisions, instead of 2.
2. changeInfo.currentRevision was null.

Another finding was that when I removed the flag CURRENT_COMMIT, none of those bugs
occurred.

One theory is that something is really wrong with creating a merge patchset with
the same parent: The change in "dev" is both a parent and a grandparent of the
change in line 3245. This should be investigated further, but this change only
fixes the flaky test.

Change-Id: Iff2bec4f74163f3634fbbc3dfbe996382a7c91e6