Skip to content

Commit 97286ca

Browse files
committed
up
1 parent 7b79e30 commit 97286ca

File tree

1 file changed

+3
-3
lines changed
  • instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob

1 file changed

+3
-3
lines changed

instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.junit.jupiter.api.Assumptions;
2626
import org.junit.jupiter.api.BeforeAll;
2727
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.condition.DisabledOnOs;
2829
import org.junit.jupiter.api.condition.OS;
2930
import org.junit.jupiter.api.extension.RegisterExtension;
3031

@@ -54,6 +55,7 @@ void testGlueJob() {
5455
jobThread.toStop("Test finish");
5556
}
5657

58+
@DisabledOnOs(value = OS.WINDOWS, disabledReason = "Shell scripts require /bin/sh")
5759
@Test
5860
void testScriptJob() {
5961
JobThread jobThread = new JobThread(2, getScriptJobHandler());
@@ -63,9 +65,7 @@ void testScriptJob() {
6365
jobThread.pushTriggerQueue(triggerParam);
6466
jobThread.start();
6567

66-
// On Windows, shell scripts may fail, so accept both UNSET and ERROR status
67-
StatusData expectedStatus = OS.WINDOWS.isCurrentOs() ? StatusData.error() : StatusData.unset();
68-
checkXxlJobWithoutCodeAttributes("GLUE(Shell)", expectedStatus, GlueTypeEnum.GLUE_SHELL, 2);
68+
checkXxlJobWithoutCodeAttributes("GLUE(Shell)", StatusData.unset(), GlueTypeEnum.GLUE_SHELL, 2);
6969
jobThread.toStop("Test finish");
7070
}
7171

0 commit comments

Comments
 (0)