You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/10/07 13:54:41 UTC
[jmeter] 01/03: Fix DNSCacheManagerSpec test so it supports system
with multiple DNS servers
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 4b00235e0b18accdfa1035d3634babd035b15529
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Mon Oct 7 16:34:51 2019 +0300
Fix DNSCacheManagerSpec test so it supports system with multiple DNS servers
---
.../jmeter/protocol/http/control/DNSCacheManagerSpec.groovy | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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: