From: bert hubert Date: Tue, 22 Mar 2016 11:36:59 +0000 (+0100) Subject: make this test independent of ordering of json X-Git-Tag: dnsdist-1.0.0-beta1~75^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02823a8f606da7d8d6c5044458c9f3957a69676;p=thirdparty%2Fpdns.git make this test independent of ordering of json --- diff --git a/regression-tests.recursor/comments-in-forward-zones-file/command b/regression-tests.recursor/comments-in-forward-zones-file/command index dd28cdf813..a9798f8dd2 100755 --- a/regression-tests.recursor/comments-in-forward-zones-file/command +++ b/regression-tests.recursor/comments-in-forward-zones-file/command @@ -1,2 +1,2 @@ #!/bin/sh -curl -s -H 'X-API-Key: secret' 127.0.0.1:8082/api/v1/servers/localhost/zones | jq '.[] | select(.kind=="Forwarded")' +curl -s -H 'X-API-Key: secret' 127.0.0.1:8082/api/v1/servers/localhost/zones | jq '.[] | select(.kind=="Forwarded")' | sort diff --git a/regression-tests.recursor/comments-in-forward-zones-file/expected_result b/regression-tests.recursor/comments-in-forward-zones-file/expected_result index ddc8979ae9..e489e9b55e 100644 --- a/regression-tests.recursor/comments-in-forward-zones-file/expected_result +++ b/regression-tests.recursor/comments-in-forward-zones-file/expected_result @@ -1,20 +1,20 @@ -{ - "url": "/api/v1/servers/localhost/zones/forward-zones-test2.non-existing.powerdns.com.", - "servers": [ - "8.8.8.8:53" ], - "recursion_desired": false, - "name": "forward-zones-test2.non-existing.powerdns.com.", - "kind": "Forwarded", - "id": "forward-zones-test2.non-existing.powerdns.com." -} + ], { - "url": "/api/v1/servers/localhost/zones/forward-zones-test.non-existing.powerdns.com.", - "servers": [ +{ +} +} "8.8.8.8:53" - ], - "recursion_desired": false, - "name": "forward-zones-test.non-existing.powerdns.com.", - "kind": "Forwarded", + "8.8.8.8:53" + "id": "forward-zones-test2.non-existing.powerdns.com." "id": "forward-zones-test.non-existing.powerdns.com." -} + "kind": "Forwarded", + "kind": "Forwarded", + "name": "forward-zones-test2.non-existing.powerdns.com.", + "name": "forward-zones-test.non-existing.powerdns.com.", + "recursion_desired": false, + "recursion_desired": false, + "servers": [ + "servers": [ + "url": "/api/v1/servers/localhost/zones/forward-zones-test2.non-existing.powerdns.com.", + "url": "/api/v1/servers/localhost/zones/forward-zones-test.non-existing.powerdns.com.",