AbstractSubmit: Log observed ChangeMergedEvents Change-Id: Id53186adaffc7f171c2d29ef2a30770bd8053d16
diff --git a/gerrit-acceptance-tests/BUCK b/gerrit-acceptance-tests/BUCK index 0a39ea7..7f9ffa6 100644 --- a/gerrit-acceptance-tests/BUCK +++ b/gerrit-acceptance-tests/BUCK
@@ -33,6 +33,7 @@ '//lib/guice:guice-assistedinject', '//lib/guice:guice-servlet', '//lib/jgit:jgit', + '//lib/log:api', '//lib/mina:sshd', ], visibility = [
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 8f519ec..3db930a 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -49,6 +49,8 @@ import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.data.ChangeAttribute; +import com.google.gerrit.server.data.PatchSetAttribute; import com.google.gerrit.server.events.ChangeMergedEvent; import com.google.gerrit.server.events.Event; import com.google.gerrit.server.notedb.ChangeNotes; @@ -70,6 +72,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -77,6 +81,9 @@ import java.util.Map; public abstract class AbstractSubmit extends AbstractDaemonTest { + private static final Logger log = + LoggerFactory.getLogger(AbstractSubmit.class); + @ConfigSuite.Config public static Config submitWholeTopicEnabled() { return submitWholeTopicEnabledConfig(); @@ -105,11 +112,14 @@ eventListener = new EventListener() { @Override public void onEvent(Event event) { - if (event instanceof ChangeMergedEvent) { - ChangeMergedEvent changeMergedEvent = (ChangeMergedEvent) event; - mergeResults.put(changeMergedEvent.change.get().number, - changeMergedEvent.newRev); + if (!(event instanceof ChangeMergedEvent)) { + return; } + ChangeMergedEvent e = (ChangeMergedEvent) event; + ChangeAttribute c = e.change.get(); + PatchSetAttribute ps = e.patchSet.get(); + log.debug("Merged {},{} as {}", ps.number, c.number, e.newRev); + mergeResults.put(e.change.get().number, e.newRev); } }; source.addEventListener(eventListener, listenerUser);