YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only. Contributed by Ming Ma.
(cherry picked from commit 6804d68901
)
This commit is contained in:
parent
c6aa6cbfe5
commit
48302e687a
|
@ -560,6 +560,9 @@ Release 2.7.0 - UNRELEASED
|
|||
YARN-2847. Linux native container executor segfaults if default banned
|
||||
user detected (Olaf Flebbe via jlowe)
|
||||
|
||||
YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only.
|
||||
(Ming Ma via cnauroth)
|
||||
|
||||
Release 2.6.0 - 2014-11-18
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -69,7 +69,7 @@ public class TestDockerContainerExecutorWithMocks {
|
|||
|
||||
@Before
|
||||
public void setup() {
|
||||
assumeTrue(!Path.WINDOWS);
|
||||
assumeTrue(Shell.LINUX);
|
||||
File f = new File("./src/test/resources/mock-container-executor");
|
||||
if(!FileUtil.canExecute(f)) {
|
||||
FileUtil.setExecutable(f, true);
|
||||
|
@ -101,7 +101,9 @@ public class TestDockerContainerExecutorWithMocks {
|
|||
@After
|
||||
public void tearDown() {
|
||||
try {
|
||||
lfs.delete(workDir, true);
|
||||
if (lfs != null) {
|
||||
lfs.delete(workDir, true);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue