From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 26 Mar 2012 23:35:01 +0000 (-0700)
Subject: [1772] supported IPv6 server address in query test in the form of [v6_addr].
X-Git-Tag: trac2351_base~226^2~116^2~92^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d2867d02fc20295ae0622c987a25e3119d3ca7f;p=thirdparty%2Fkea.git

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

note that this change should be backward compatible.
---

diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py
index c070dd2081..408ff7273b 100644
--- a/tests/lettuce/features/terrain/querying.py
+++ b/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 = []