YARN-28. Fixed TestCompositeService to not depend on test-order and thus made it pass on JDK7. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1386907 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2526a96aaa
commit
37d5618742
|
@ -31,6 +31,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
YARN-93. Fixed RM to propagate diagnostics from applications that have
|
||||
finished but failed (Jason Lowe via vinodkv).
|
||||
|
||||
YARN-28. Fixed TestCompositeService to not depend on test-order and thus
|
||||
made it pass on JDK7 (Thomas Graves via vinodkv).
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
|
|
@ -25,6 +25,7 @@ import org.apache.hadoop.conf.Configuration;
|
|||
import org.apache.hadoop.yarn.YarnException;
|
||||
import org.apache.hadoop.yarn.service.CompositeService;
|
||||
import org.apache.hadoop.yarn.service.Service.STATE;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
public class TestCompositeService {
|
||||
|
@ -33,6 +34,11 @@ public class TestCompositeService {
|
|||
|
||||
private static final int FAILED_SERVICE_SEQ_NUMBER = 2;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
CompositeServiceImpl.resetCounter();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCallSequence() {
|
||||
ServiceManager serviceManager = new ServiceManager("ServiceManager");
|
||||
|
@ -226,6 +232,10 @@ public class TestCompositeService {
|
|||
counter = -1;
|
||||
}
|
||||
|
||||
public static void resetCounter() {
|
||||
counter = -1;
|
||||
}
|
||||
|
||||
public void setThrowExceptionOnStart(boolean throwExceptionOnStart) {
|
||||
this.throwExceptionOnStart = throwExceptionOnStart;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue