Repository: hadoop Updated Branches: refs/heads/branch-2 1f80e05eb -> 96befde48
HADOOP-14715. TestWasbRemoteCallHelper failing. Contributed by Esfandiar Manii. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bbf8c4ba Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bbf8c4ba Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bbf8c4ba Branch: refs/heads/branch-2 Commit: bbf8c4bacba56f39cad5fb207f7c97a5b5778f34 Parents: 1f80e05 Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 10 16:49:19 2017 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 10 16:49:19 2017 +0100 ---------------------------------------------------------------------- .../apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java | 7 +++++-- .../hadoop-azure/src/test/resources/azure-test.xml | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbf8c4ba/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java index fac631a..5e78194 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/TestWasbRemoteCallHelper.java @@ -282,6 +282,8 @@ public class TestWasbRemoteCallHelper @Test public void testWhenOneInstanceIsDown() throws Throwable { + boolean isAuthorizationCachingEnabled = fs.getConf().getBoolean(CachingAuthorizer.KEY_AUTH_SERVICE_CACHING_ENABLE, false); + // set up mocks HttpClient mockHttpClient = Mockito.mock(HttpClient.class); HttpEntity mockHttpEntity = Mockito.mock(HttpEntity.class); @@ -356,8 +358,9 @@ public class TestWasbRemoteCallHelper performop(mockHttpClient); - Mockito.verify(mockHttpClient, times(2)).execute(Mockito.argThat(new HttpGetForServiceLocal())); - Mockito.verify(mockHttpClient, times(2)).execute(Mockito.argThat(new HttpGetForService2())); + int expectedNumberOfInvocations = isAuthorizationCachingEnabled ? 1 : 2; + Mockito.verify(mockHttpClient, times(expectedNumberOfInvocations)).execute(Mockito.argThat(new HttpGetForServiceLocal())); + Mockito.verify(mockHttpClient, times(expectedNumberOfInvocations)).execute(Mockito.argThat(new HttpGetForService2())); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbf8c4ba/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml index 8c88743..8cea256 100644 --- a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml +++ b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml @@ -29,10 +29,13 @@ </property> --> - <property> - <name>fs.azure.secure.mode</name> - <value>true</value> - </property> + <!-- uncomment to test in Azure secure mode --> + <!-- + <property> + <name>fs.azure.secure.mode</name> + <value>true</value> + </property> + --> <property> <name>fs.azure.user.agent.prefix</name> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org