From: bert hubert Date: Wed, 1 Mar 2017 11:56:32 +0000 (+0100) Subject: make rfc2308 test less fragile by using jq X-Git-Tag: rec-4.1.0-alpha1~239^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=217b48a5499049bdc004e03d7cfd072f71133d66;p=thirdparty%2Fpdns.git make rfc2308 test less fragile by using jq --- diff --git a/regression-tests.nobackend/zone2json-rfc2308/command b/regression-tests.nobackend/zone2json-rfc2308/command index 7197f6a04b..3440252f40 100755 --- a/regression-tests.nobackend/zone2json-rfc2308/command +++ b/regression-tests.nobackend/zone2json-rfc2308/command @@ -1,3 +1,3 @@ #!/bin/sh -${ZONE2JSON} --zone=zone2json-rfc2308/rfc2308.com --zone-name=example.com +${ZONE2JSON} --zone=zone2json-rfc2308/rfc2308.com --zone-name=example.com | jq '.records[].ttl' diff --git a/regression-tests.nobackend/zone2json-rfc2308/expected_result b/regression-tests.nobackend/zone2json-rfc2308/expected_result index 65bdbb5a0d..782847364c 100644 --- a/regression-tests.nobackend/zone2json-rfc2308/expected_result +++ b/regression-tests.nobackend/zone2json-rfc2308/expected_result @@ -1 +1,6 @@ -{"name": "example.com", "records": [{"content": "ns1.example.com marka.isc.org 0 0 0 0 1", "name": "example.com.", "prio": 0, "ttl": 7200, "type": "SOA"}, {"content": "127.0.0.1", "name": "www.example.com.", "prio": 0, "ttl": 7200, "type": "A"}, {"content": "ns1.example.com", "name": "example.com.", "prio": 0, "ttl": 7200, "type": "NS"}, {"content": "127.0.0.1", "name": "ns1.example.com.", "prio": 0, "ttl": 7200, "type": "A"}, {"content": "127.0.0.2", "name": "ns2.example.com.", "prio": 0, "ttl": 3600, "type": "A"}, {"content": "127.0.0.3", "name": "ns3.example.com.", "prio": 0, "ttl": 86400, "type": "A"}]} +7200 +7200 +7200 +7200 +3600 +86400