From 8ceb93b8ace3ba9d2cb60800a457ebe77c00b32d Mon Sep 17 00:00:00 2001 From: Khalid Shakir Date: Fri, 23 Sep 2011 21:03:22 -0400 Subject: [PATCH] Fixed an integration test which crashed on the out of date LSF DRMAA library when run against the obsolete LSF dotkit instead of .combined_LSF_SGE --- .../drmaa/v1_0/JnaSessionIntegrationTest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionIntegrationTest.java b/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionIntegrationTest.java index 3dfd0550d..48f4c3777 100644 --- a/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionIntegrationTest.java +++ b/public/java/test/org/broadinstitute/sting/jna/drmaa/v1_0/JnaSessionIntegrationTest.java @@ -34,6 +34,7 @@ import java.io.File; import java.util.*; public class JnaSessionIntegrationTest extends BaseTest { + private String implementation = null; private static final SessionFactory factory = new JnaSessionFactory(); @Test @@ -44,10 +45,23 @@ public class JnaSessionIntegrationTest extends BaseTest { System.out.println(String.format("DRMAA contact(s): %s", session.getContact())); System.out.println(String.format("DRM system(s): %s", session.getDrmSystem())); System.out.println(String.format("DRMAA implementation(s): %s", session.getDrmaaImplementation())); + this.implementation = session.getDrmaaImplementation(); } - @Test + @Test(dependsOnMethods = { "testDrmaa" }) public void testSubmitEcho() throws Exception { + if (implementation.contains("LSF")) { + System.err.println(" ***********************************************************"); + System.err.println(" *************************************************************"); + System.err.println(" **** ****"); + System.err.println(" **** Skipping JnaSessionIntegrationTest.testSubmitEcho() ****"); + System.err.println(" **** Are you using the dotkit .combined_LSF_SGE? ****"); + System.err.println(" **** ****"); + System.err.println(" *************************************************************"); + System.err.println(" ***********************************************************"); + return; + } + File outFile = createNetworkTempFile("JnaSessionIntegrationTest-", ".out"); Session session = factory.getSession(); session.init(null);