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 7197f6a04b0ade6e6cd6101d17d3a351f74558ad..3440252f406be808ca5077d4917db9f8c691f4c7 100755 (executable)
--- 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 65bdbb5a0d109d4db4ae6fd38e61ba13a82492c1..782847364c3bfd5cce0cce61a1ba25d8af6d2215 100644 (file)
--- 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