Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "MAPREDUCE-7303. Fix TestJobResourceUploader failures after HADOOP-16878. Contributed by Peter Bacsko." 

This reverts commit 7bc305db5d.
This commit is contained in:
Chao Sun 2021-09-25 09:29:33 -07:00
parent 4c516536be
commit 2ee294b1b1
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestJobResourceUploader.java
View File

@ -399,7 +399,6 @@ public class TestJobResourceUploader {
Path expectedRemotePath) throws IOException, URISyntaxException { Path expectedRemotePath) throws IOException, URISyntaxException {
Path dstPath = new Path("hdfs://localhost:1234/home/hadoop/"); Path dstPath = new Path("hdfs://localhost:1234/home/hadoop/");
DistributedFileSystem fs = mock(DistributedFileSystem.class); DistributedFileSystem fs = mock(DistributedFileSystem.class);
when(fs.makeQualified(any(Path.class))).thenReturn(dstPath);
// make sure that FileUtils.copy() doesn't try to copy anything // make sure that FileUtils.copy() doesn't try to copy anything
when(fs.mkdirs(any(Path.class))).thenReturn(false); when(fs.mkdirs(any(Path.class))).thenReturn(false);
when(fs.getUri()).thenReturn(dstPath.toUri()); when(fs.getUri()).thenReturn(dstPath.toUri());
@ -408,7 +407,6 @@ public class TestJobResourceUploader {
JobConf jConf = new JobConf(); JobConf jConf = new JobConf();
Path originalPath = spy(path); Path originalPath = spy(path);
FileSystem localFs = mock(FileSystem.class); FileSystem localFs = mock(FileSystem.class);
when(localFs.makeQualified(any(Path.class))).thenReturn(path);
FileStatus fileStatus = mock(FileStatus.class); FileStatus fileStatus = mock(FileStatus.class);
when(localFs.getFileStatus(any(Path.class))).thenReturn(fileStatus); when(localFs.getFileStatus(any(Path.class))).thenReturn(fileStatus);
when(fileStatus.isDirectory()).thenReturn(true); when(fileStatus.isDirectory()).thenReturn(true);
@ -422,14 +420,8 @@ public class TestJobResourceUploader {
originalPath, jConf, (short) 1); originalPath, jConf, (short) 1);
ArgumentCaptor<Path> pathCaptor = ArgumentCaptor.forClass(Path.class); ArgumentCaptor<Path> pathCaptor = ArgumentCaptor.forClass(Path.class);
verify(fs, times(2)).makeQualified(pathCaptor.capture()); verify(fs).makeQualified(pathCaptor.capture());
List<Path> paths = pathCaptor.getAllValues(); Assert.assertEquals("Path", expectedRemotePath, pathCaptor.getValue());
// first call is invoked on a path which was created by the test,
// but the second one is created in copyRemoteFiles()
Assert.assertEquals("Expected remote path",
expectedRemotePath, paths.get(0));
Assert.assertEquals("Expected remote path",
expectedRemotePath, paths.get(1));
} }
private void testErasureCodingSetting(boolean defaultBehavior) private void testErasureCodingSetting(boolean defaultBehavior)