Browse Source

[1772] supported IPv6 server address in query test in the form of [v6_addr].

note that this change should be backward compatible.
JINMEI Tatuya 13 years ago
parent
commit
7d2867d02f
1 changed files with 2 additions and 1 deletions
  1. 2 1
      tests/lettuce/features/terrain/querying.py

+ 2 - 1
tests/lettuce/features/terrain/querying.py

@@ -201,7 +201,7 @@ class QueryResult(object):
         pass
 
 @step('A (dnssec )?query for ([\S]+) (?:type ([A-Z0-9]+) )?' +
-      '(?:class ([A-Z]+) )?(?:to ([^:]+)(?::([0-9]+))? )?' +
+      '(?:class ([A-Z]+) )?(?:to ([^:]+|\[[0-9a-fA-F:]+\])(?::([0-9]+))? )?' +
       'should have rcode ([\w.]+)')
 def query(step, dnssec, query_name, qtype, qclass, addr, port, rcode):
     """
@@ -223,6 +223,7 @@ def query(step, dnssec, query_name, qtype, qclass, addr, port, rcode):
         qclass = "IN"
     if addr is None:
         addr = "127.0.0.1"
+    addr = re.sub(r"\[(.+)\]", r"\1", addr) # convert [IPv6_addr] to IPv6_addr
     if port is None:
         port = 47806
     additional_arguments = []