You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:29:23 UTC
svn commit: r1077562 -
/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java
Author: omalley
Date: Fri Mar 4 04:29:23 2011
New Revision: 1077562
URL: http://svn.apache.org/viewvc?rev=1077562&view=rev
Log:
commit 4e9ae93926c4dec0ae6fea40e5ed780e944cfb10
Author: Arun C Murthy <ac...@apache.org>
Date: Thu May 20 23:04:35 2010 -0700
MAPREDUCE-1807. Re-factor TestQueueManager. Contributed by Richard King.
+++ b/YAHOO-CHANGES.txt
+ MAPREDUCE-1807. Re-factor TestQueueManager. (Richard King via acmurthy)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java?rev=1077562&r1=1077561&r2=1077562&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java Fri Mar 4 04:29:23 2011
@@ -196,7 +196,7 @@ public class TestQueueManagerForJobKillA
//write out queue-acls.xml.
UtilsForTests.setUpConfigFile(queueConfProps, queueConfigFile);
//refresh configuration
- queueManager.refreshQueues(conf);
+ queueManager.refreshAcls(conf);
//Submission should succeed
assertTrue("User Job Submission failed after refresh.",
queueManager.hasAccess("default", QueueACL.SUBMIT_JOB, ugi));
@@ -214,7 +214,7 @@ public class TestQueueManagerForJobKillA
hadoopConfProps.put(QueueManager.toFullPropertyName
("q1", submitAcl), ugi.getShortUserName());
UtilsForTests.setUpConfigFile(hadoopConfProps, hadoopConfigFile);
- queueManager.refreshQueues(conf);
+ queueManager.refreshAcls(conf);
assertTrue("User Job Submission allowed after refresh and no queue acls file.",
queueManager.hasAccess("q1", QueueACL.SUBMIT_JOB, ugi));
} finally{
@@ -235,7 +235,7 @@ public class TestQueueManagerForJobKillA
String queueConfigPath =
System.getProperty("test.build.extraconf", "build/test/extraconf");
File queueConfigFile =
- new File(queueConfigPath, QueueManager.QUEUE_ACLS_FILE_NAME );
+ new File(queueConfigPath, QueueManager.QUEUE_ACLS_FILE_NAME);
File hadoopConfigFile = new File(queueConfigPath, "hadoop-site.xml");
try {
// queue properties with which the cluster is started.
@@ -274,7 +274,7 @@ public class TestQueueManagerForJobKillA
try {
//Exception to be thrown by queue manager because configuration passed
//is invalid.
- queueManager.refreshQueues(conf);
+ queueManager.refreshAcls(conf);
fail("Refresh of ACLs should have failed with invalid conf file.");
} catch (Exception e) {
}