opendev/gerrit
Code Issues Proposed changes

AbstractSubmit: Log observed ChangeMergedEvents

Browse Source 
Change-Id: Id53186adaffc7f171c2d29ef2a30770bd8053d16
This commit is contained in:
Dave Borowitz
2016-02-01 12:32:13 -05:00
parent 617adae4f2
commit add6932f77
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/BUCK
View File

@@ -33,6 +33,7 @@ java_library(
'//lib/guice:guice-assistedinject', '//lib/guice:guice-assistedinject',
'//lib/guice:guice-servlet', '//lib/guice:guice-servlet',
'//lib/jgit:jgit', '//lib/jgit:jgit',
'//lib/log:api',
'//lib/mina:sshd', '//lib/mina:sshd',
], ],
visibility = [ visibility = [

18
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -49,6 +49,8 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser; 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.ChangeMergedEvent;
import com.google.gerrit.server.events.Event; import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeNotes;
@@ -70,6 +72,8 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@@ -77,6 +81,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
public abstract class AbstractSubmit extends AbstractDaemonTest { public abstract class AbstractSubmit extends AbstractDaemonTest {
private static final Logger log =
LoggerFactory.getLogger(AbstractSubmit.class);
@ConfigSuite.Config @ConfigSuite.Config
public static Config submitWholeTopicEnabled() { public static Config submitWholeTopicEnabled() {
return submitWholeTopicEnabledConfig(); return submitWholeTopicEnabledConfig();
@@ -105,11 +112,14 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
eventListener = new EventListener() { eventListener = new EventListener() {
@Override @Override
public void onEvent(Event event) { public void onEvent(Event event) {
if (event instanceof ChangeMergedEvent) { if (!(event instanceof ChangeMergedEvent)) {
ChangeMergedEvent changeMergedEvent = (ChangeMergedEvent) event; return;
mergeResults.put(changeMergedEvent.change.get().number,
changeMergedEvent.newRev);
} }
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); source.addEventListener(eventListener, listenerUser);