From ff9390f83fb28fdede9ae138cf692580290faf1c Mon Sep 17 00:00:00 2001 From: bert hubert Date: Tue, 22 Mar 2016 13:48:32 +0100 Subject: [PATCH] turns out that you also need to strip trailing , to be impervious to JSON order changes. --- .../comments-in-forward-zones-file/command | 2 +- .../expected_result | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/regression-tests.recursor/comments-in-forward-zones-file/command b/regression-tests.recursor/comments-in-forward-zones-file/command index a9798f8dd2..5896eb8be8 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")' | sort +curl -s -H 'X-API-Key: secret' 127.0.0.1:8082/api/v1/servers/localhost/zones | jq '.[] | select(.kind=="Forwarded")' | sort | sed 's/,$//' 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 e489e9b55e..138cff8b88 100644 --- a/regression-tests.recursor/comments-in-forward-zones-file/expected_result +++ b/regression-tests.recursor/comments-in-forward-zones-file/expected_result @@ -1,5 +1,5 @@ - ], - ], + ] + ] { { } @@ -8,13 +8,13 @@ "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, + "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.", + "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." -- 2.47.2