This is an automated email from the ASF dual-hosted git repository. rob pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 072c1c6ccb0e4ddc2c727be0a0fe88f5a1af4d93 Author: Jan van Doorn <j...@knutsel.com> AuthorDate: Fri May 25 11:15:25 2018 -0600 fix separator of headers, cleanup --- grove/integration_test/compare_gets.go | 4 ++-- .../tests/plugins/range_req_handler/test.sh | 21 ++++----------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/grove/integration_test/compare_gets.go b/grove/integration_test/compare_gets.go index 385df26..5eeab70 100644 --- a/grove/integration_test/compare_gets.go +++ b/grove/integration_test/compare_gets.go @@ -106,7 +106,7 @@ func compareResponses(response1 responseType, response2 responseType, ignoreHdrs if ignoreMPB { contentTypeHdr := response1.Headers.Get("Content-type") - fmt.Println("ignoreing", contentTypeHdr, response1) + //fmt.Println("ignoreing", contentTypeHdr, response1) if strings.HasPrefix(contentTypeHdr, "multipart/byteranges") { parts := strings.Split(contentTypeHdr, "=") MPBoundary := parts[1] @@ -151,7 +151,7 @@ func main() { resp := httpGet(*originURL+"/"+*path, *orgHdrs) cresp := httpGet(*cacheURL+"/"+*path, *cacheHdrs) if !compareResponses(resp, cresp, strings.Split(*ignoreHdrs, ","), *ignoreMultiPartBoundary) { - fmt.Println("FAIL: Body bytes don't match \n%s\n != \n%s\n", string(resp.Body), string(cresp.Body)) + fmt.Printf("FAIL: Body bytes don't match \n%s\n != \n%s\n", string(resp.Body), string(cresp.Body)) os.Exit(1) } diff --git a/grove/integration_test/tests/plugins/range_req_handler/test.sh b/grove/integration_test/tests/plugins/range_req_handler/test.sh index 4654318..1908850 100644 --- a/grove/integration_test/tests/plugins/range_req_handler/test.sh +++ b/grove/integration_test/tests/plugins/range_req_handler/test.sh @@ -9,28 +9,15 @@ file="10Mb.txt" result=0 testno=0 -#curl -s -r 50000-50009 ${originurl}${file} > /tmp/out1 && echo FAIL test ${testno} -#result=$(($result+$?)) -#testno=$(($testno+1)) -# -#curl -s -r 50000-50009 -H"Host: ${host}" ${cacheurl}/${file} > /tmp/out2 && echo FAIL test ${testno} -# -#result=$(($result+$?)) -#testno=$(($testno+1)) -# -#diff /tmp/out1 /tmp/out2 && echo FAIL test ${testno} -#result=$(($result+$?)) -#testno=$(($testno+1)) - -for host in "mem-test.cdn.kabletown.net", "disk1-test.cdn.kabletown.net" +for host in "mem-test.cdn.kabletown.net" "disk-test.cdn.kabletown.net" do - for r in "0-0", "0-100", "5000-", "-100", "0-0,10-15", "0-100,200-210", "33-99,66-88" "-" + for r in "0-0" "0-100" "5000-" "-100" "0-010-15" "0-100200-210" "33-9966-88" "-" do - test="/compare_gets --chdrs \"Host:$host,Range:bytes=\r${r}\" --ohdrs \"Range:bytes=${r}\" --path \"10Mb.txt\" --ignorehdrs \"Server,Date\"" + test="/compare_gets --chdrs \"Host:$host Range:bytes=${r}\" --ohdrs \"Range:bytes=${r}\" --path \"10Mb.txt\" --ignorehdrs \"Server,Date\"" testno=$(($testno+1)) echo -n "Test $testno ($test): " - /compare_gets --chdrs "Host:$host,Range:bytes=${r}" --ohdrs "Range:bytes=${r}" --path "10Mb.txt" --ignorehdrs "Server,Date" + /compare_gets --chdrs "Host:$host Range:bytes=${r}" --ohdrs "Range:bytes=${r}" --path "10Mb.txt" --ignorehdrs "Server,Date" result=$(($result+$?)) done -- To stop receiving notification emails like this one, please contact r...@apache.org.