Skip to content

Commit 8e9ff60

Browse files
committed
Disable tests that need HTTP registry access on GHA #195
1 parent 6fa9471 commit 8e9ff60

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Gradle Version
1414
run: ./gradlew --version
1515
- name: Build
16-
run: ./gradlew build -PtestAllSupportedGradleVersions=true
16+
run: ./gradlew build -PtestAllSupportedGradleVersions=true -PtestProxyIntegrationTests=false
1717
windows:
1818
runs-on: windows-latest
1919
steps:
@@ -26,7 +26,7 @@ jobs:
2626
- name: Gradle Version
2727
run: ./gradlew --version
2828
- name: Build
29-
run: ./gradlew build
29+
run: ./gradlew build -PtestProxyIntegrationTests=false
3030
macos:
3131
runs-on: macos-latest
3232
steps:
@@ -39,4 +39,4 @@ jobs:
3939
- name: Gradle Version
4040
run: ./gradlew --version
4141
- name: Build
42-
run: ./gradlew build
42+
run: ./gradlew build -PtestProxyIntegrationTests=false

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ tasks.test {
7474
)
7575
systemProperty("testMinimumCurrentGradleVersion", project.properties["testMinimumCurrentGradleVersion"] ?: "false")
7676
systemProperty("testCurrentGradleVersion", project.properties["testCurrentGradleVersion"] ?: "true")
77+
systemProperty("testProxyIntegrationTests", project.properties["testProxyIntegrationTests"] ?: "true")
7778

7879
val processorsCount = Runtime.getRuntime().availableProcessors()
7980
maxParallelForks = if (processorsCount > 2) processorsCount.div(2) else processorsCount

src/test/groovy/com/github/gradle/node/npm/task/NpmProxy_integTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import com.github.gradle.node.ProxyTestHelper
55
import org.gradle.testkit.runner.TaskOutcome
66
import org.mockserver.integration.ClientAndServer
77
import org.mockserver.socket.PortFactory
8+
import spock.lang.Requires
89

910
import static org.mockserver.integration.ClientAndServer.startClientAndServer
1011
import static org.mockserver.model.HttpRequest.request
1112
import static org.mockserver.verify.VerificationTimes.exactly
1213

14+
@Requires({ System.getProperty("testProxyIntegrationTests").equals("true") })
1315
class NpmProxy_integTest extends AbstractIntegTest {
1416
private ClientAndServer proxyMockServer
1517

src/test/groovy/com/github/gradle/node/yarn/task/YarnProxy_integTest.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.github.gradle.node.ProxyTestHelper
55
import org.gradle.testkit.runner.TaskOutcome
66
import org.mockserver.integration.ClientAndServer
77
import org.mockserver.socket.PortFactory
8+
import spock.lang.Requires
89

910
import static java.nio.charset.StandardCharsets.UTF_8
1011
import static org.mockserver.integration.ClientAndServer.startClientAndServer
@@ -13,6 +14,7 @@ import static org.mockserver.model.SocketAddress.Scheme.HTTP
1314
import static org.mockserver.model.SocketAddress.Scheme.HTTPS
1415
import static org.mockserver.verify.VerificationTimes.exactly
1516

17+
@Requires({ System.getProperty("testProxyIntegrationTests").equals("true") })
1618
class YarnProxy_integTest extends AbstractIntegTest {
1719
private ClientAndServer proxyMockServer
1820
// We have to configure a second proxy otherwise Yarn does not want to use its own repository using HTTP,

0 commit comments

Comments
 (0)