Skip to content

Commit 24cd3c1

Browse files
committed
Revert "Disable flaky integration tests for now"
This reverts commit 1627f57 in preparation for fixing the root cause
1 parent 2a8c369 commit 24cd3c1

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartIntegrationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonProperty;
28-
import org.junit.jupiter.api.Disabled;
2928
import reactor.core.publisher.Flux;
3029
import reactor.core.publisher.Mono;
3130
import reactor.core.scheduler.Schedulers;
@@ -63,7 +62,6 @@
6362
import static org.assertj.core.api.Assertions.assertThat;
6463
import static org.junit.jupiter.api.Assumptions.assumeFalse;
6564

66-
@Disabled
6765
class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests {
6866

6967
private WebClient webClient;

spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/CoroutinesIntegrationTests.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import kotlinx.coroutines.flow.Flow
2424
import kotlinx.coroutines.flow.flow
2525
import org.assertj.core.api.Assertions.assertThat
2626
import org.assertj.core.api.Assertions.assertThatExceptionOfType
27-
import org.junit.jupiter.api.Disabled
2827
import org.springframework.context.ApplicationContext
2928
import org.springframework.context.annotation.AnnotationConfigApplicationContext
3029
import org.springframework.context.annotation.ComponentScan
@@ -40,7 +39,6 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpSe
4039
import reactor.core.publisher.Flux
4140
import java.time.Duration
4241

43-
@Disabled
4442
class CoroutinesIntegrationTests : AbstractRequestMappingIntegrationTests() {
4543

4644
override fun initApplicationContext(): ApplicationContext {

0 commit comments

Comments
 (0)