From common-commits-return-78590-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon Feb 12 16:30:37 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 4DDC9180652 for ; Mon, 12 Feb 2018 16:30:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3351B160C3F; Mon, 12 Feb 2018 15:30:37 +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 792A5160C31 for ; Mon, 12 Feb 2018 16:30:36 +0100 (CET) Received: (qmail 27738 invoked by uid 500); 12 Feb 2018 15:30:35 -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 27729 invoked by uid 99); 12 Feb 2018 15:30:35 -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; Mon, 12 Feb 2018 15:30:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47C0BE08A1; Mon, 12 Feb 2018 15:30:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7917. Fix failing test TestDockerContainerRuntime#testLaunchContainerWithDockerTokens. Contributed by Shane Kumpf Date: Mon, 12 Feb 2018 15:30:34 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-3.1 e82abfd64 -> aad3958e5 YARN-7917. Fix failing test TestDockerContainerRuntime#testLaunchContainerWithDockerTokens. Contributed by Shane Kumpf (cherry picked from commit 3414fd1243c0b0dcbb9cea986af5f096300eba97) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aad3958e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aad3958e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aad3958e Branch: refs/heads/branch-3.1 Commit: aad3958e50ab6235e80ce7a5da687dcfe2c116f9 Parents: e82abfd Author: Jason Lowe Authored: Mon Feb 12 09:27:43 2018 -0600 Committer: Jason Lowe Committed: Mon Feb 12 09:30:06 2018 -0600 ---------------------------------------------------------------------- .../linux/runtime/TestDockerContainerRuntime.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aad3958e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java index e9cf765..4c53eb1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java @@ -1775,7 +1775,7 @@ public class TestDockerContainerRuntime { List dockerCommands = Files .readAllLines(Paths.get(dockerCommandFile), Charset.forName("UTF-8")); - int expected = 15; + int expected = 16; int counter = 0; Assert.assertEquals(expected, dockerCommands.size()); Assert.assertEquals("[docker-command-execution]", @@ -1797,12 +1797,12 @@ public class TestDockerContainerRuntime { dockerCommands.get(counter++)); Assert.assertEquals(" name=container_id", dockerCommands.get(counter++)); Assert.assertEquals(" net=host", dockerCommands.get(counter++)); + Assert.assertEquals(" ro-mounts=/test_filecache_dir:/test_filecache_dir," + + "/test_user_filecache_dir:/test_user_filecache_dir", + dockerCommands.get(counter++)); Assert.assertEquals( - " rw-mounts=/test_container_local_dir:/test_container_local_dir," - + "/test_filecache_dir:/test_filecache_dir," - + "/test_container_work_dir:/test_container_work_dir," - + "/test_container_log_dir:/test_container_log_dir," - + "/test_user_local_dir:/test_user_local_dir", + " rw-mounts=/test_container_log_dir:/test_container_log_dir," + + "/test_application_local_dir:/test_application_local_dir", dockerCommands.get(counter++)); Assert.assertEquals(" user=" + uidGidPair, dockerCommands.get(counter++)); Assert.assertEquals(" workdir=/test_container_work_dir", --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org