From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS8972 188.138.9.0/24 X-Spam-Status: No, score=-2.0 required=3.0 tests=AWL,BAYES_00,RCVD_IN_XBL, URIBL_BLOCKED shortcircuit=no autolearn=no version=3.3.2 X-Original-To: rainbows-public@bogomips.org Received: from 80x24.org (atlantic480.us.unmetered.com [188.138.9.49]) by dcvr.yhbt.net (Postfix) with ESMTP id 4A3E71F7E1 for ; Mon, 14 Sep 2015 05:33:39 +0000 (UTC) From: Eric Wong To: rainbows-public@bogomips.org Subject: [PATCH 5/6] t/t0044-autopush.sh: remove test Date: Mon, 14 Sep 2015 05:33:17 +0000 Message-Id: <20150914053318.12251-6-e@80x24.org> In-Reply-To: <20150914053318.12251-1-e@80x24.org> References: <20150914053318.12251-1-e@80x24.org> List-Id: kgio no longer does anything with autopush, so this test is broken. Autopush was overkill and badly done (MSG_MORE is better on Linux, FreeBSD should copy it :P). --- t/t0044-autopush.sh | 121 ---------------------------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 t/t0044-autopush.sh diff --git a/t/t0044-autopush.sh b/t/t0044-autopush.sh deleted file mode 100644 index 103f9fc..0000000 --- a/t/t0044-autopush.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -. ./test-lib.sh -STRACE=$(which strace 2>/dev/null || :) -if ! test -x "$STRACE" -then - t_info "strace not found, skipping $T" - exit 0 -fi -if test x"$(uname -s)" != xLinux -then - t_info "Linux is the only supported OS for $T" - exit 0 -fi - -# these buffer internally in external libraries, so we can't detect when -# to use TCP_CORK -skip_models EventMachine NeverBlock -skip_models StreamResponseEpoll -skip_models Coolio CoolioThreadPool CoolioThreadSpawn -skip_models Revactor Rev RevThreadPool RevThreadSpawn - -# not sure why, but we don't have time to care about Ruby 1.8 too much -case $RUBY_VERSION in -1.8.*) skip_models WriterThreadSpawn WriterThreadPool ;; -esac - -t_plan 13 "Kgio autopush tests" - -start_strace () { - # dbgcat strace_out - > $strace_out - sleep 1 - strace -p $worker_pid -e '!futex' -f -o $strace_out & - strace_pid=$! - while ! test -s $strace_out; do sleep 1; done -} - -check_TCP_CORK () { - nr=0 - while test 2 -gt $(grep TCP_CORK $strace_out | count_lines) - do - nr=$(( $nr + 1 )) - if test $nr -gt 30 - then - dbgcat strace_out - die "waited too long ($nr seconds) for TCP_CORK" - fi - sleep 1 - done - - test 2 -eq $(grep TCP_CORK $strace_out | count_lines) - fgrep 'SOL_TCP, TCP_CORK, [0],' $strace_out - fgrep 'SOL_TCP, TCP_CORK, [1],' $strace_out -} - -t_begin "setup and start" && { - rainbows_setup $model 1 1 - rtmpfiles strace_out - ed -s $unicorn_config < true, :tcp_nopush => true/ -w -EOF - rainbows -D large-file-response.ru -c $unicorn_config -E none - rainbows_wait_start -} - -t_begin "read worker pid" && { - worker_pid=$(curl -sSf http://$listen/pid) - kill -0 $worker_pid -} - -t_begin "start strace on worker" && start_strace - -t_begin "reading RSS uncorks" && { - curl -sSf http://$listen/rss >/dev/null -} - -t_begin "restart strace on worker" && { - kill $strace_pid - wait - start_strace -} - -t_begin "reading static file uncorks" && { - curl -sSf http://$listen/random_blob >/dev/null - check_TCP_CORK -} - -t_begin "stop strace on worker" && { - kill $strace_pid - wait -} - -t_begin "enable sendfile" && { - echo >> $unicorn_config 'require "sendfile"' - kill -HUP $rainbows_pid - test xSTART = x"$(cat $fifo)" -} - -t_begin "reread worker pid" && { - worker_pid=$(curl -sSf http://$listen/pid) - kill -0 $worker_pid -} - -t_begin "restart strace on the worker" && start_strace - -t_begin "HTTP/1.x GET on static file with sendfile uncorks" && { - curl -sSf http://$listen/random_blob >/dev/null - check_TCP_CORK -} - -t_begin "killing succeeds" && { - kill $strace_pid - wait - # dbgcat strace_out - kill $rainbows_pid -} - -t_begin "check stderr" && check_stderr - -t_done -- EW