Skip to content

Commit

Permalink
Remove jetty workaround.
Browse files Browse the repository at this point in the history
  • Loading branch information
cmnbroad committed Feb 28, 2023
1 parent 89f5ad1 commit dbbd0f8
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ public class ReadsSparkSinkUnitTest extends GATKBaseTest {

@BeforeClass(alwaysRun = true)
private void setupMiniCluster() throws IOException {
// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
cluster = MiniClusterUtils.getMiniCluster();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,6 @@ public void testReadFromFileAndHDFS() throws Exception {
final GATKPath bam = new GATKPath(getTestFile("hdfs_file_test.bam").getAbsolutePath());
final File bai = getTestFile("hdfs_file_test.bai");
// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster( cluster -> {
final Path workingDirectory = MiniClusterUtils.getWorkingDir(cluster);
final Path bamPath = new Path(workingDirectory,"hdfs.bam");
Expand All @@ -223,11 +219,6 @@ public void testCRAMReferenceFromHDFS() throws Exception {
final GATKPath reference = new GATKPath(v37_chr17_1Mb_Reference);
final GATKPath referenceIndex = new GATKPath(v37_chr17_1Mb_Reference + ".fai");

// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster( cluster -> {
final Path workingDirectory = MiniClusterUtils.getWorkingDir(cluster);
final Path cramHDFSPath = new Path(workingDirectory, "hdfs.cram");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ public final class VariantsSparkSinkUnitTest extends GATKBaseTest {

@BeforeClass(alwaysRun = true)
private void setupMiniCluster() throws IOException {
// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
cluster = MiniClusterUtils.getMiniCluster();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ public void testInsertLengthPileup(boolean useShuffle) throws Exception {

@Test(dataProvider = "shuffle")
public void testFeaturesPileupHdfs(boolean useShuffle) throws Exception {
if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster( cluster -> {
final Path workingDirectory = MiniClusterUtils.getWorkingDir(cluster);
final Path vcfPath = new Path(workingDirectory, "dbsnp_138.b37.20.21.vcf");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ public void testReadAndWriteCRAMAndReferenceOnHDFS() throws Exception {
final GATKPath testRefDict = new GATKPath(getTestFile("count_reads.dict").getAbsolutePath());
final GATKPath testRefIndex = new GATKPath(getTestFile("count_reads.fasta.fai").getAbsolutePath());

if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster(cluster -> {
final org.apache.hadoop.fs.Path workingDirectory = MiniClusterUtils.getWorkingDir(cluster);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ public void testRunLocal(final CpxVariantReInterpreterSparkIntegrationTestArgs p

@Test(groups = "sv", dataProvider = "forCpxVariantReInterpreterSparkIntegrationTest")
public void testRunHDFS(final CpxVariantReInterpreterSparkIntegrationTestArgs params) throws Exception {
if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster(cluster -> {

final List<String> argsToBeModified = Arrays.asList( new ArgumentsBuilder().addRaw(params.getCommandLine()).getArgsArray() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ public void testDiscoverVariantsRunnableLocal(final DiscoverVariantsFromContigAl
@Test(dataProvider = "discoverVariantsFromContigAlignmentsSparkIntegrationTest", groups = "sv")
public void testDiscoverVariantsRunnableMiniCluster(final DiscoverVariantsFromContigAlignmentsSAMSparkIntegrationTestArgs params) throws Exception {

if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster(cluster -> {

final List<String> argsToBeModified = Arrays.asList( new ArgumentsBuilder().addRaw(params.getCommandLine()).getArgsArray() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ public void testFindBreakpointRunnableLocal(final FindBreakpointEvidenceSparkInt
@Test(dataProvider = "findBreakpointEvidenceSparkIntegrationTest", groups = "sv")
public void testFindBreakpointRunnableMiniCluster(final FindBreakpointEvidenceSparkIntegrationTestArgs params) throws Exception {

if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster(cluster -> {

final List<String> argsToBeModified = Arrays.asList( new ArgumentsBuilder().addRaw(params.getCommandLine()).getArgsArray() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ public void testSVDiscoverPipelineRunnableLocal(final StructuralVariationDiscove
@Test(dataProvider = "svDiscoverPipelineSparkIntegrationTest", groups = "sv")
public void testSVDiscoverPipelineRunnableMiniCluster(final StructuralVariationDiscoveryPipelineSparkIntegrationTestArgs params) throws Exception {

if (isGATKDockerContainer()) {
// see https://github.com/eclipse/jetty.project/issues/8549
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster(cluster -> {

final List<String> argsToBeModified = Arrays.asList( new ArgumentsBuilder().addRaw(params.getCommandLine()).getArgsArray() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ public void testCopyAndDeleteHDFS() throws Exception {
final String src = publicTestDir + "empty.vcf";
File dest = createTempFile("copy-empty", ".vcf");

// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster( cluster -> {
final String intermediate = BucketUtils.randomRemotePath(MiniClusterUtils.getWorkingDir(cluster).toString(), "test-copy-empty", ".vcf");
Assert.assertTrue(BucketUtils.isHadoopUrl(intermediate), "!BucketUtils.isHadoopUrl(intermediate)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,6 @@ public void testAppendPathToDir() throws Exception {
Assert.assertEquals(IOUtils.appendPathToDir("dir/", "/file"), "/file");
Assert.assertEquals(IOUtils.appendPathToDir("/path/to/dir", "anotherdir/file"), "/path/to/dir/anotherdir/file");

// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
// hdfs: URI
MiniDFSCluster cluster = null;
try {
Expand Down Expand Up @@ -534,11 +529,6 @@ public void testUnsuccessfulCanReadFileCheck(final File file) {
@Test
public void testCreateDirectory() throws IOException {

// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
// hdfs
Path tempPath = IOUtils.getPath(MiniClusterUtils.getWorkingDir(MiniClusterUtils.getMiniCluster()).toUri().toString())
.resolve("temp");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ public void testConvertHeaderlessHadoopBamShardToBam() {

@Test
public void testPathExists() throws Exception {
// see https://github.com/eclipse/jetty.project/issues/8549
if (isGATKDockerContainer()) {
// for the docker tests, the test dependencies are in a separate jar
throw new SkipException("skipping due to jetty jar parsing issues (https://github.com/eclipse/jetty.project/issues/8549)");
}
MiniClusterUtils.runOnIsolatedMiniCluster( cluster -> {
//use the HDFS on the mini cluster
final Path workingDirectory = MiniClusterUtils.getWorkingDir(cluster);
Expand Down

0 comments on commit dbbd0f8

Please sign in to comment.