From d24f5b9d681070353e5db912a66ea9a7fd07b240 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 19 Sep 2019 15:49:29 +0900 Subject: [PATCH] Update git submodules * Update plugins/replication from branch 'stable-2.16' to 04bd5274b5b9d852989f92ad42a3ceea3f917238 - PushOneTest: Remove unused mock ReplicationQueue Change-Id: I162fb33059ef954b437d230cef05f732752dc137 - ReplicationStateTest: Remove unused mock ReplicationTasksStorage Change-Id: I285805381512d76437ad740764697784b8f39c9e - Wrap calls to createProject in a utility method The createProject method is removed in stable-3.0, and creating a test project must be done with the ProjectOperations class. This means that when a new test is added in stable-2.16 and uses createProject, there is a conflict when merging it up to stable-3.0. Wrap all the calls to createProject in a new utility method and call that instead in the tests. This commit will conflict on the next merge up to stable-3.0, but then there will be no more conflicts in future. Change-Id: I271d0d55cd07c25eb4c6f8acc47d144b47600356 - ReplicationIT: stop using EasyMock Integration tests should never use mocks as they are always supposed to use the real implementation and the integration between components. Remove the use of EasyMock as it has a very limited contribution and impact on ReplicationIT. Change-Id: I61d42c69164484486187f123a2fa26f8810c1924 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 434edc8134..04bd5274b5 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 434edc81349b5c6efcbcadd809c71d13c787296d +Subproject commit 04bd5274b5b9d852989f92ad42a3ceea3f917238