From bd7596e50bd094edf5e5842afb8239c158fe2491 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 24 Dec 2016 21:41:24 +0000
Subject: Revert "t/t0044-autopush.sh: remove test"

Stuck between a rock and a hard place..
This reverts commit 5c911ab2470a2ca9c140b3a2e20ae810bf758590
and restores autopush support when using kgio 2.11.0+

Explanations on the kgio mailing list below:

https://bogomips.org/kgio-public/20161216-kgio-2.11.0-released@fail/
https://bogomips.org/kgio-public/20161216000110.GA7366@untitled/T/#u

We can drop kgio when we drop Ruby <= 2.2 support in a few years.
---
 t/t0044-autopush.sh | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 t/test_isolate.rb   |   2 +-
 2 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 t/t0044-autopush.sh

diff --git a/t/t0044-autopush.sh b/t/t0044-autopush.sh
new file mode 100644
index 0000000..103f9fc
--- /dev/null
+++ b/t/t0044-autopush.sh
@@ -0,0 +1,121 @@
+#!/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 <<EOF
+,s/^listen.*/listen "$listen", :tcp_nodelay => 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
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index bb56ef0..9fa3822 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -16,7 +16,7 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.10.0'
+  gem 'kgio', '2.11.0'
   gem 'rack', '2.0.1'
   gem 'kcar', '0.6.0'
   gem 'raindrops', '0.17.0'
-- 
cgit v1.2.3-24-ge0c7