| commit | f1a74c9fdfef59ab0bd511d1f15ac43ced0b61f6 | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Wed Jan 04 22:52:48 2023 +0000 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Wed Jan 04 23:03:47 2023 +0000 |
| tree | 2da1e98fcaee8d8a938a9276a7a1313161e855a6 | |
| parent | d63b7a68c7e20890cf67d4733a31134b85200f5e [diff] |
Remove replicateNoteDbMetaRefs from remoteConfiguration The replicateNoteDbMetaRefs() method was introduced only on the master branch of the replication plugin. The pull-replication stable-3.6 branch was initially created out of master and therefore contained this unwanted method. Remove the method and make sure that the re-merge to master becomes a NOOP. Also ignore the test shouldReturnBadRequestWhenDeletingAnInvalidProjectName because it would only work on Gerrit master. Change-Id: I89066ccfa14db38fe666f34cf0c2a39009c2c75f
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 33cc3e8..aff1266 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,9 +216,4 @@ 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 de8a942..a46a721 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,6 +23,7 @@ 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 { @@ -75,6 +76,7 @@ } @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);