From: Kees Monshouwer Date: Thu, 9 May 2013 10:41:08 +0000 (+0200) Subject: improve mysqldiff output format X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6f8e9d9a0e46b8f77ce686d72419b71b3e0b5b0;p=thirdparty%2Fpdns.git improve mysqldiff output format --- diff --git a/regression-tests/1dyndns-update-add-delete/expected_result b/regression-tests/1dyndns-update-add-delete/expected_result index 370d66de10..0315e0b91c 100644 --- a/regression-tests/1dyndns-update-add-delete/expected_result +++ b/regression-tests/1dyndns-update-add-delete/expected_result @@ -6,7 +6,7 @@ Answer: Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists --- Start: diff start step.1 --- -> add-delete.test.dyndns A 127.0.0.108 3600 0 +> add-delete.test.dyndns A 0 127.0.0.108 3600 --- End: diff start step.1 --- Answer: @@ -17,6 +17,6 @@ Answer: Check if record is gone --- Start: diff step.1 step.2 --- -< add-delete.test.dyndns A 127.0.0.108 3600 0 +< add-delete.test.dyndns A 0 127.0.0.108 3600 --- End: diff step.1 step.2 --- diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.dnssec b/regression-tests/1dyndns-update-add-delete/expected_result.dnssec index a6eb629943..ac9d141ae0 100644 --- a/regression-tests/1dyndns-update-add-delete/expected_result.dnssec +++ b/regression-tests/1dyndns-update-add-delete/expected_result.dnssec @@ -6,7 +6,7 @@ Answer: Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists --- Start: diff start step.1 --- -> add-delete.test.dyndns A 127.0.0.108 3600 0 add-delete 1 +> add-delete.test.dyndns A 0 127.0.0.108 3600 'add-delete' 1 --- End: diff start step.1 --- Answer: @@ -17,6 +17,6 @@ Answer: Check if record is gone --- Start: diff step.1 step.2 --- -< add-delete.test.dyndns A 127.0.0.108 3600 0 add-delete 1 +< add-delete.test.dyndns A 0 127.0.0.108 3600 'add-delete' 1 --- End: diff step.1 step.2 --- diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.narrow b/regression-tests/1dyndns-update-add-delete/expected_result.narrow index 54dbb0c373..22a64c0f4e 100644 --- a/regression-tests/1dyndns-update-add-delete/expected_result.narrow +++ b/regression-tests/1dyndns-update-add-delete/expected_result.narrow @@ -6,7 +6,7 @@ Answer: Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists --- Start: diff start step.1 --- -> add-delete.test.dyndns A 127.0.0.108 3600 0 1 +> add-delete.test.dyndns A 0 127.0.0.108 3600 '' 1 --- End: diff start step.1 --- Answer: @@ -17,6 +17,6 @@ Answer: Check if record is gone --- Start: diff step.1 step.2 --- -< add-delete.test.dyndns A 127.0.0.108 3600 0 1 +< add-delete.test.dyndns A 0 127.0.0.108 3600 '' 1 --- End: diff step.1 step.2 --- diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 b/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 index d3cd61e2ff..6c68ba9de8 100644 --- a/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 +++ b/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 @@ -6,7 +6,7 @@ Answer: Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists --- Start: diff start step.1 --- -> add-delete.test.dyndns A 127.0.0.108 3600 0 gkhs0ms64101fs1dj19h7no8vn2tp4fk 1 +> add-delete.test.dyndns A 0 127.0.0.108 3600 'gkhs0ms64101fs1dj19h7no8vn2tp4fk' 1 --- End: diff start step.1 --- Answer: @@ -17,6 +17,6 @@ Answer: Check if record is gone --- Start: diff step.1 step.2 --- -< add-delete.test.dyndns A 127.0.0.108 3600 0 gkhs0ms64101fs1dj19h7no8vn2tp4fk 1 +< add-delete.test.dyndns A 0 127.0.0.108 3600 'gkhs0ms64101fs1dj19h7no8vn2tp4fk' 1 --- End: diff step.1 step.2 --- diff --git a/regression-tests/mysqldiff b/regression-tests/mysqldiff index 6866c99d29..748536ce7b 100755 --- a/regression-tests/mysqldiff +++ b/regression-tests/mysqldiff @@ -16,11 +16,11 @@ if [ "${context: -9}" = "-nodnssec" ] then mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ "$GMYSQLDB" \ - -e "SELECT r.name, r.type, r.content, r.ttl, r.prio FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step + -e "SELECT r.name, r.type, r.prio, r.content, r.ttl FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step else mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ "$GMYSQLDB" \ - -e "SELECT r.name, r.type, r.content, r.ttl, r.prio, r.ordername, r.auth FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step + -e "SELECT r.name, r.type, r.prio, r.content, r.ttl, CONCAT('''', CONCAT(r.ordername, '''')), r.auth FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step fi if [ ! "$step" == "start" ] @@ -29,7 +29,7 @@ then diff ${testsdir}/${testname}/$diffto ${testsdir}/${testname}/$step | sed '/^[0-9a-z,/-]*$/d' | sort -V if [ ${PIPESTATUS[0]} -eq 0 ] then - echo "is equal" + echo "no differnce" fi echo -e "--- End: diff $diffto $step ---\n" fi