Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8DA63D6A9 for ; Fri, 13 Jul 2012 18:45:50 +0000 (UTC) Received: (qmail 96973 invoked by uid 500); 13 Jul 2012 18:45:49 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 96859 invoked by uid 500); 13 Jul 2012 18:45:49 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 96840 invoked by uid 99); 13 Jul 2012 18:45:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 18:45:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 18:45:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5891223889CB; Fri, 13 Jul 2012 18:45:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1361335 - in /hadoop/common/branches/branch-0.22/mapreduce: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java Date: Fri, 13 Jul 2012 18:45:28 -0000 To: mapreduce-commits@hadoop.apache.org From: shv@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120713184528.5891223889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shv Date: Fri Jul 13 18:45:27 2012 New Revision: 1361335 URL: http://svn.apache.org/viewvc?rev=1361335&view=rev Log: MAPREDUCE-4405. Test case for HierarchicalQueue in TestJobQueueClient. Contributed by Mayank Bansal. Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1361335&r1=1361334&r2=1361335&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Fri Jul 13 18:45:27 2012 @@ -14,6 +14,9 @@ Release 0.22.1 - Unreleased MAPREDUCE-4404. Test case for TestMRJobClient to verify user name. (Mayank Bansal via shv) + MAPREDUCE-4405. Test case for HierarchicalQueue in TestJobQueueClient. + (Mayank Bansal via shv) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java?rev=1361335&r1=1361334&r2=1361335&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java (original) +++ hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestJobQueueClient.java Fri Jul 13 18:45:27 2012 @@ -24,6 +24,7 @@ import static org.apache.hadoop.mapred.Q import static org.apache.hadoop.mapred.QueueManagerTestUtils.deleteQueuesConfigFile; import static org.apache.hadoop.mapred.QueueManagerTestUtils.writeToFile; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import java.io.StringWriter; @@ -43,6 +44,25 @@ public class TestJobQueueClient { } @Test + public void testQueueListwithHierarchicalQueue() throws Exception { + // create some sample queues in a hierarchy.. + JobQueueInfo[] roots = new JobQueueInfo[2]; + roots[0] = new JobQueueInfo("q1", "q1 scheduling info"); + roots[1] = new JobQueueInfo("q2", "q2 scheduling info"); + + List children = new ArrayList(); + children.add(new JobQueueInfo("q1:1", null)); + children.add(new JobQueueInfo("q1:2", null)); + roots[0].setChildren(children); + + JobQueueClient client = new JobQueueClient(new JobConf()); + List allQueues = client.expandQueueList(roots); + + assertNotNull("Queues should not be null", allQueues); + assertEquals(4, allQueues.size()); + } + + @Test public void testQueueOrdering() throws Exception { // create some sample queues in a hierarchy.. JobQueueInfo[] roots = new JobQueueInfo[2];