From: David Zafman <dzafman@redhat.com>
Date: Wed, 28 Jun 2017 21:18:38 +0000 (-0700)
Subject: test: Clean up extra json output from log
X-Git-Tag: ses5-milestone8~1^2~21^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b0263b16574b95ec5f32beeee5496cbac2ae905;p=ceph.git

test: Clean up extra json output from log

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index 50e56d67e807..2da1c0caa625 100755
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -605,14 +605,12 @@ function TEST_corrupt_scrub_replicated() {
     pg_scrub $pg
 
     rados list-inconsistent-pg $poolname > $dir/json || return 1
-    cat $dir/json
     # Check pg count
     test $(jq '. | length' $dir/json) = "1" || return 1
     # Check pgid
     test $(jq -r '.[0]' $dir/json) = $pg || return 1
 
     rados list-inconsistent-obj $pg > $dir/json || return 1
-    cat $dir/json
     # Get epoch for repair-get requests
     epoch=$(jq .epoch $dir/json)
 
@@ -978,14 +976,12 @@ EOF
     pg_deep_scrub $pg
 
     rados list-inconsistent-pg $poolname > $dir/json || return 1
-    cat $dir/json
     # Check pg count
     test $(jq '. | length' $dir/json) = "1" || return 1
     # Check pgid
     test $(jq -r '.[0]' $dir/json) = $pg || return 1
 
     rados list-inconsistent-obj $pg > $dir/json || return 1
-    cat $dir/json
     # Get epoch for repair-get requests
     epoch=$(jq .epoch $dir/json)
 
@@ -1666,14 +1662,12 @@ function corrupt_scrub_erasure() {
     pg_scrub $pg
 
     rados list-inconsistent-pg $poolname > $dir/json || return 1
-    cat $dir/json
     # Check pg count
     test $(jq '. | length' $dir/json) = "1" || return 1
     # Check pgid
     test $(jq -r '.[0]' $dir/json) = $pg || return 1
 
     rados list-inconsistent-obj $pg > $dir/json || return 1
-    cat $dir/json
     # Get epoch for repair-get requests
     epoch=$(jq .epoch $dir/json)
 
@@ -1927,14 +1921,12 @@ EOF
     pg_deep_scrub $pg
 
     rados list-inconsistent-pg $poolname > $dir/json || return 1
-    cat $dir/json
     # Check pg count
     test $(jq '. | length' $dir/json) = "1" || return 1
     # Check pgid
     test $(jq -r '.[0]' $dir/json) = $pg || return 1
 
     rados list-inconsistent-obj $pg > $dir/json || return 1
-    cat $dir/json
     # Get epoch for repair-get requests
     epoch=$(jq .epoch $dir/json)