Skip to content

fix repeat until failure usage #4054

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

Merged
andimarek merged 2 commits into from
Jul 23, 2025
+7 −8
Merged

fix repeat until failure usage #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a532f82
fix repeat until failure usage
andimarek Jul 23, 2025
a95016a
remove wrong ignore annotation
andimarek Jul 23, 2025
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
8 changes: 3 additions & 5 deletions src/test/groovy/graphql/ChainedDataLoaderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import org.dataloader.BatchLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.dataloader.DataLoaderRegistry
import spock.lang.RepeatUntilFailure
import spock.lang.Specification
import spock.lang.Unroll

import java.time.Duration
import java.util.concurrent.Executors
Expand Down Expand Up @@ -86,7 +86,7 @@ class ChainedDataLoaderTest extends Specification {
batchLoadCalls == 2
}

@Unroll
@RepeatUntilFailure(maxAttempts = 20, ignoreRest = false)
def "parallel different data loaders"() {
given:
def sdl = '''
Expand Down Expand Up @@ -177,8 +177,6 @@ class ChainedDataLoaderTest extends Specification {
er.data == [hello: "friendsLunakey1Skipperkey2", helloDelayed: "friendsLunakey1-delayedSkipperkey2-delayed"]
batchLoadCalls.get() == 6

where:
i << (0..20)
}


Expand Down Expand Up @@ -339,7 +337,7 @@ class ChainedDataLoaderTest extends Specification {
batchLoadCalls == 3
}

def "chained data loaders with two isolated data loaders"() {
def "chained data loaders with two delayed data loaders"() {
given:
def sdl = '''

Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/graphql/GraphqlErrorHelperTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class GraphqlErrorHelperTest extends Specification {
}
}

@RepeatUntilFailure(maxAttempts = 1_000)
@RepeatUntilFailure(maxAttempts = 1_000, ignoreRest = false)
def "can deterministically serialize SourceLocation"() {
when:
def specMap = GraphqlErrorHelper.toSpecification(new TestError())
Expand Down
3 changes: 2 additions & 1 deletion src/test/groovy/graphql/execution/instrumentation/dataloader/DeferWithDataLoaderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,8 @@ class DeferWithDataLoaderTest extends Specification {
batchCompareDataFetchers.productsForDepartmentsBatchLoaderCounter.get() == 1
}

@RepeatUntilFailure(maxAttempts = 50)
@RepeatUntilFailure(maxAttempts = 50, ignoreRest = false)
// skip until
def "dataloader in initial result and chained dataloader inside nested defer block"() {
given:
def sdl = '''
Expand Down
2 changes: 1 addition & 1 deletion ...roovy/graphql/execution/instrumentation/dataloader/Issue1178DataLoaderDispatchTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring
class Issue1178DataLoaderDispatchTest extends Specification {


@RepeatUntilFailure(maxAttempts = 100)
@RepeatUntilFailure(maxAttempts = 100, ignoreRest = false)
def "shouldn't dispatch twice in multithreaded env"() {
setup:
def sdl = """
Expand Down