| commit | f24617edf6d76a0f633b0212dca57b1cea2226ba | [log] [tgz] |
|---|---|---|
| author | Christopher Miliotis <christoforos.miliotis.dev@gmail.com> | Thu Apr 13 09:54:53 2023 +0100 |
| committer | Christopher Miliotis <christoforos.miliotis.dev@gmail.com> | Thu Apr 13 09:54:53 2023 +0100 |
| tree | d7781b2812cf41d76adeef7cacf37dd918d8285a | |
| parent | 023eaf9215ddcfd596040d53b8cd7622355c68d1 [diff] | |
| parent | 14c41cc1bdcf52d0e5c115f2c6e42e21bec8ff2f [diff] |
Merge branch 'stable-3.7' * stable-3.7: Increase FetchOne coverage with unit tests Display the in-flight taskId when a runway conflict is detected Restore the fetching of all refs with empty delta Allow to filter out refs from the fetch-replication deltas Do not accumulate replication events with retrying tasks Add replication taskId during the execution of the fetch Allow FetchOne to retry the failed ref only Change-Id: Ia5918efb83f768137cf4c225de385ac36200b1ee
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java index aff1266..33cc3e8 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -216,4 +216,9 @@ public int getPushBatchSize() { return 0; } + + @Override + public boolean replicateNoteDbMetaRefs() { + return true; + } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java index a46a721..de8a942 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ProjectDeletionActionIT.java
@@ -23,7 +23,6 @@ import com.google.inject.Inject; import javax.servlet.http.HttpServletResponse; import org.apache.http.client.methods.HttpRequestBase; -import org.junit.Ignore; import org.junit.Test; public class ProjectDeletionActionIT extends ActionITBase { @@ -76,7 +75,6 @@ } @Test - @Ignore("Failing in RestApiServlet: to be enabled again once that is fixed in core") public void shouldReturnBadRequestWhenDeletingAnInvalidProjectName() throws Exception { url = getURLWithAuthenticationPrefix(INVALID_TEST_PROJECT_NAME);