Skip to content

Commit

Permalink
marking some tests as unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
fviale committed Jan 29, 2016
1 parent 84768e4 commit e4ad10f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,8 @@
import org.junit.rules.TemporaryFolder;
import org.ow2.proactive.scheduler.common.NotificationData;
import org.ow2.proactive.scheduler.common.SchedulerEvent;
import org.ow2.proactive.scheduler.common.job.Job;
import org.ow2.proactive.scheduler.common.job.JobEnvironment;
import org.ow2.proactive.scheduler.common.job.JobId;
import org.ow2.proactive.scheduler.common.job.JobInfo;
import org.ow2.proactive.scheduler.common.job.JobState;
import org.ow2.proactive.scheduler.common.job.JobStatus;
import org.ow2.proactive.scheduler.common.job.TaskFlowJob;
import org.ow2.proactive.scheduler.common.job.UserIdentification;
import org.ow2.proactive.scheduler.common.job.*;
import org.ow2.proactive.scheduler.common.job.factories.Job2XMLTransformer;
import org.ow2.proactive.scheduler.common.task.ForkEnvironment;
import org.ow2.proactive.scheduler.common.task.JavaTask;
import org.ow2.proactive.scheduler.common.task.TaskInfo;
import org.ow2.proactive.scheduler.common.task.dataspaces.InputAccessMode;
Expand Down Expand Up @@ -87,9 +79,9 @@ public final class RestSmartProxyTest extends AbstractRestFuncTestCase {
protected static final String TASK_NAME = "TestJavaTask";

// we add special characters to ensure they are supported
public final static String INPUT_FILE_BASE_NAME = "input é";
public final static String INPUT_FILE_BASE_NAME = "input é";
public final static String INPUT_FILE_EXT = ".txt";
public final static String OUTPUT_FILE_BASE_NAME = "output é";
public final static String OUTPUT_FILE_BASE_NAME = "output é";
public final static String OUTPUT_FILE_EXT = ".out";

protected RestSmartProxyImpl restSmartProxy;
Expand Down Expand Up @@ -125,8 +117,8 @@ private void initializeRestSmartProxyInstance() throws Exception {
pullUrl = userspace;

// we add special characters and space to the folders to make sure transfer occurs normally
inputLocalFolder = tempDir.newFolder("input é");
outputLocalFolder = tempDir.newFolder("output é");
inputLocalFolder = tempDir.newFolder("input é");
outputLocalFolder = tempDir.newFolder("output é");
}

@Test(timeout = TEN_MINUTES)
Expand Down Expand Up @@ -226,7 +218,7 @@ private void testJobSubmission(boolean isolateTaskOutput, boolean automaticTrans
private TaskFlowJob createTestJob(boolean isolateOutputs) throws Exception {
TaskFlowJob job = new TaskFlowJob();
// add a special character to the job name to ensure the job is parsed correctly by the server
job.setName(this.getClass().getSimpleName() + " é");
job.setName(this.getClass().getSimpleName() + " é");

for (int i = 0; i < NB_TASKS; i++) {
JavaTask testTask = new JavaTask();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,17 @@
*/
package functionaltests;

import java.io.File;
import java.net.URL;

import org.junit.Ignore;
import org.junit.Test;
import org.ow2.proactive.resourcemanager.common.NodeState;
import org.ow2.proactive.resourcemanager.common.event.RMEventType;
import org.ow2.proactive.resourcemanager.common.event.RMNodeEvent;
import org.ow2.proactive.scheduler.common.job.TaskFlowJob;
import org.ow2.proactive.scheduler.common.job.factories.JobFactory_stax;
import org.ow2.tests.FunctionalTest;
import org.junit.Test;

import java.io.File;
import java.net.URL;

import static org.junit.Assert.assertEquals;

Expand All @@ -56,6 +57,7 @@ public class TestNonForkedScriptTask extends FunctionalTest {
.getResource("/functionaltests/descriptors/Job_non_forked_script_task.xml");

@Test
@Ignore("Unstable")
public void nonForkedTasks_SystemExitScript_KillsANode() throws Throwable {
SchedulerTHelper.startScheduler(new File(SchedulerTHelper.class.getResource(
"config/scheduler-nonforkedscripttasks.ini").toURI()).getAbsolutePath());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package functionaltests.taskkill;

import org.objectweb.proactive.utils.OperatingSystem;
import org.ow2.proactive.resourcemanager.frontend.ResourceManager;

import org.ow2.proactive.scheduler.common.job.TaskFlowJob;
import org.ow2.tests.FunctionalTest;

Expand All @@ -15,6 +17,10 @@ public class TestChildProcessOfNodeKilled extends FunctionalTest {

@Test
public void childProcessesForkedByTaskAreCleanedUpWhenRMNodeStarterIsKilled() throws Throwable {
if (OperatingSystem.getOperatingSystem() == OperatingSystem.windows) {
System.out.println("Test disabled on windows because of \"The filename or extension is too long\" issue");
return;
}
TNode tNode = startSchedulerAndRMWithOneNode();
startJobForkingProcesses();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.objectweb.proactive.api.PAActiveObject;
import org.objectweb.proactive.core.ProActiveTimeoutException;
Expand Down Expand Up @@ -207,7 +208,8 @@ protected void waitWithMonitor(EventMonitor monitor, long timeout) throws ProAct
}

@Test
public void run() throws Throwable {
@Ignore("Unstable")
public void test() throws Throwable {
SchedulerTHelper
.log("***************************************************************************************************");
SchedulerTHelper
Expand Down

0 comments on commit e4ad10f

Please sign in to comment.