From common-commits-return-92970-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Feb 4 07:15:52 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 23C25180651 for ; Mon, 4 Feb 2019 08:15:51 +0100 (CET) Received: (qmail 82220 invoked by uid 500); 4 Feb 2019 07:15:50 -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 82202 invoked by uid 99); 4 Feb 2019 07:15:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2019 07:15:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id F1F8D85BEB; Mon, 4 Feb 2019 07:15:49 +0000 (UTC) Date: Mon, 04 Feb 2019 07:15:49 +0000 To: "common-commits@hadoop.apache.org" Subject: [hadoop] branch branch-3.2 updated: YARN-9263. TestConfigurationNodeAttributesProvider fails after Mockito updated. Contributed by Weiwei Yang. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154926454985.27521.2577600793276317664@gitbox.apache.org> From: sunilg@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hadoop X-Git-Refname: refs/heads/branch-3.2 X-Git-Reftype: branch X-Git-Oldrev: 7cd7d5b62827b9c8bb4c8d7ad35f864a844d220f X-Git-Newrev: a0fafbc3ef7ad35696dec6ef1f5f4740c3153d49 X-Git-Rev: a0fafbc3ef7ad35696dec6ef1f5f4740c3153d49 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sunilg pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.2 by this push: new a0fafbc YARN-9263. TestConfigurationNodeAttributesProvider fails after Mockito updated. Contributed by Weiwei Yang. a0fafbc is described below commit a0fafbc3ef7ad35696dec6ef1f5f4740c3153d49 Author: Weiwei Yang AuthorDate: Sat Feb 2 23:04:34 2019 +0800 YARN-9263. TestConfigurationNodeAttributesProvider fails after Mockito updated. Contributed by Weiwei Yang. (cherry picked from commit f20b043a02bd5b20f68123b2a7ab86f7cb9fe32a) --- .../nodelabels/TestConfigurationNodeAttributesProvider.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/TestConfigurationNodeAttributesProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/TestConfigurationNodeAttributesProvider.java index bad74d8..5cee942 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/TestConfigurationNodeAttributesProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/nodelabels/TestConfigurationNodeAttributesProvider.java @@ -93,7 +93,7 @@ public class TestConfigurationNodeAttributesProvider { YarnConfiguration.NM_NODE_ATTRIBUTES_PROVIDER_FETCH_INTERVAL_MS, 1000); ConfigurationNodeAttributesProvider spyProvider = Mockito.spy(nodeAttributesProvider); - Mockito.when(spyProvider.parseAttributes(Mockito.anyString())) + Mockito.when(spyProvider.parseAttributes(Mockito.any())) .thenReturn(expectedAttributes1); spyProvider.init(conf); @@ -107,7 +107,7 @@ public class TestConfigurationNodeAttributesProvider { expectedAttributes2.add(NodeAttribute .newInstance("test.io", "os", NodeAttributeType.STRING, "windows")); - Mockito.when(spyProvider.parseAttributes(Mockito.anyString())) + Mockito.when(spyProvider.parseAttributes(Mockito.any())) .thenReturn(expectedAttributes2); // Since we set fetch interval to 1s, it needs to wait for 1s until @@ -152,11 +152,10 @@ public class TestConfigurationNodeAttributesProvider { YarnConfiguration.NM_NODE_ATTRIBUTES_PROVIDER_FETCH_INTERVAL_MS, -1); ConfigurationNodeAttributesProvider spyProvider = Mockito.spy(nodeAttributesProvider); - Mockito.when(spyProvider.parseAttributes(Mockito.anyString())) + Mockito.when(spyProvider.parseAttributes(Mockito.any())) .thenReturn(expectedAttributes1); spyProvider.init(conf); spyProvider.start(); - Assert.assertEquals(expectedAttributes1, spyProvider.getDescriptors()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org