Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A8CC820049E for ; Thu, 10 Aug 2017 17:54:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A770316B8B2; Thu, 10 Aug 2017 15:54:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ED87A16B8AB for ; Thu, 10 Aug 2017 17:54:22 +0200 (CEST) Received: (qmail 62748 invoked by uid 500); 10 Aug 2017 15:54:22 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 62739 invoked by uid 99); 10 Aug 2017 15:54:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2017 15:54:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5EC7DFA44; Thu, 10 Aug 2017 15:54:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stevel@apache.org To: common-commits@hadoop.apache.org Date: Thu, 10 Aug 2017 15:54:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hadoop git commit: HADOOP-14715. TestWasbRemoteCallHelper failing. Contributed by Esfandiar Manii. archived-at: Thu, 10 Aug 2017 15:54:23 -0000 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 Authored: Thu Aug 10 16:49:19 2017 +0100 Committer: Steve Loughran 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 @@ --> - - fs.azure.secure.mode - true - + + fs.azure.user.agent.prefix --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org