Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset timeout before each test #180

Merged
merged 2 commits into from
Nov 17, 2022
Merged

Reset timeout before each test #180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76032d7
Reset timeout before each test
alexstaeding Nov 16, 2022
4a0be8c
Fix comment
alexstaeding Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions core/src/main/kotlin/org/sourcegrade/jagr/core/testing/JavaRuntimeTester.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import org.apache.logging.log4j.Logger
import org.junit.platform.commons.JUnitException
import org.junit.platform.engine.discovery.ClassSelector
import org.junit.platform.engine.discovery.DiscoverySelectors
import org.junit.platform.launcher.TestExecutionListener
import org.junit.platform.launcher.TestIdentifier
import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder
import org.junit.platform.launcher.core.LauncherFactory
import org.junit.platform.launcher.listeners.SummaryGeneratingListener
Expand All @@ -32,10 +34,12 @@ import org.sourcegrade.jagr.api.testing.TestCycle
import org.sourcegrade.jagr.core.compiler.java.RuntimeClassLoaderImpl
import org.sourcegrade.jagr.core.compiler.java.plus
import org.sourcegrade.jagr.core.executor.TimeoutHandler
import org.sourcegrade.jagr.launcher.env.Config

class JavaRuntimeTester @Inject constructor(
private val logger: Logger,
private val testCycleParameterResolver: TestCycleParameterResolver,
private val config: Config,
) : RuntimeTester {
override fun createTestCycle(grader: GraderJarImpl, submission: Submission): TestCycle? {
if (submission !is JavaSubmission) return null
Expand Down Expand Up @@ -86,11 +90,19 @@ class JavaRuntimeTester @Inject constructor(
return try {
val summaryListener = SummaryGeneratingListener()
val statusListener = TestStatusListenerImpl(logger)
TimeoutHandler.setClassNames(map { it.className })
TimeoutHandler.resetTimeout()
launcher.execute(testPlan, summaryListener, statusListener)
// if total timeout has been reached, reset so that the rubric provider doesn't throw an error
TimeoutHandler.disableTimeout()
if (config.transformers.timeout.enabled) {
val timeoutListener = object : TestExecutionListener {
override fun executionStarted(testIdentifier: TestIdentifier) {
TimeoutHandler.resetTimeout()
}
}
TimeoutHandler.setClassNames(map { it.className })
launcher.execute(testPlan, summaryListener, statusListener, timeoutListener)
// disable so that the rubric provider doesn't throw an error
TimeoutHandler.disableTimeout()
} else {
launcher.execute(testPlan, summaryListener, statusListener)
}
statusListener.logLinkageErrors(info)
JUnitResultImpl(testPlan, summaryListener, statusListener)
} catch (e: Throwable) {
Expand Down