This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch vlsi/github_actions in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit fbc837a2d9776a3ac25afcfab0d470a24f59270d Author: Vladimir Sitnikov <[email protected]> AuthorDate: Mon Oct 7 16:34:51 2019 +0300 Fix DNSCacheManagerSpec test so it supports system with multiple DNS servers --- build.gradle.kts | 11 ++++++++--- .../jmeter/protocol/http/control/DNSCacheManagerSpec.groovy | 12 ++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index df367d1..74bb428 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -534,9 +534,14 @@ allprojects { showStandardStreams = true } // Pass the property to tests - systemProperty("java.awt.headless", System.getProperty("java.awt.headless")) - systemProperty("junit.jupiter.execution.parallel.enabled", "true") - systemProperty("junit.jupiter.execution.timeout.default", "2 m") + fun passProperty(name: String, default: String? = null) { + val value = System.getProperty(name) ?: default + value?.let { systemProperty(name, it) } + } + passProperty("java.awt.headless") + passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server") + passProperty("junit.jupiter.execution.parallel.enabled", "true") + passProperty("junit.jupiter.execution.timeout.default", "2 m") } withType<SpotBugsTask>().configureEach { group = LifecycleBasePlugin.VERIFICATION_GROUP diff --git a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy index 3bf9baf..fc242e0 100644 --- a/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy +++ b/src/protocol/http/src/test/groovy/org/apache/jmeter/protocol/http/control/DNSCacheManagerSpec.groovy @@ -26,7 +26,7 @@ import spock.lang.IgnoreIf class DNSCacheManagerSpec extends JMeterSpec { - private static final String VALID_DNS_SERVER = ResolverConfig.getCurrentConfig().servers()[0]; + private static final String[] VALID_DNS_SERVERS = ResolverConfig.getCurrentConfig().servers() private static final String INVALID_DNS_SERVER = "512.1.1.1" static def localDNSResolverFailed() { @@ -97,20 +97,24 @@ class DNSCacheManagerSpec extends JMeterSpec { }) def "Valid DNS resolves and caches with custom resolve true"() { given: - sut.addServer(VALID_DNS_SERVER) + for (dns in VALID_DNS_SERVERS) { + sut.addServer(dns) + } sut.setCustomResolver(true) sut.setTimeoutMs(5000) when: sut.resolve("jmeter.apache.org") then: sut.resolver != null - ((ExtendedResolver) sut.resolver).getResolvers().length == 1 + ((ExtendedResolver) sut.resolver).getResolvers().length == VALID_DNS_SERVERS.length sut.cache.size() == 1 } def "Cache should be used where entries exist"() { given: - sut.addServer(VALID_DNS_SERVER) + for (dns in VALID_DNS_SERVERS) { + sut.addServer(dns) + } sut.setCustomResolver(true) sut.setTimeoutMs(5000) when:
