From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS16276 164.132.0.0/16 X-Spam-Status: No, score=-1.5 required=3.0 tests=AWL,BAYES_00, RCVD_IN_MSPIKE_BL,RCVD_IN_MSPIKE_ZBI,RCVD_IN_XBL,RDNS_DYNAMIC,SPF_FAIL, SPF_HELO_FAIL shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from 80x24.org (91.ip-164-132-51.eu [164.132.51.91]) by dcvr.yhbt.net (Postfix) with ESMTP id 77BA92021F for ; Tue, 2 Aug 2016 21:43:43 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] test: skip some buffering tests on non-default values Date: Tue, 2 Aug 2016 21:43:40 +0000 Message-Id: <20160802214340.27389-1-e@80x24.org> List-Id: It's too hard to reliably test output buffering behavior with non-default values users sometimes set; so just skip and warn about it for now. ref: commit dad99b5ecd93cdf0a514ff9fb51d198f8aebb188 ("test/test_proxy_pass: remove buffer size tuning") --- test/helper.rb | 12 ++++++++++++ test/test_output_buffering.rb | 1 + 2 files changed, 13 insertions(+) diff --git a/test/helper.rb b/test/helper.rb index 73cde51..7b5c353 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -147,6 +147,18 @@ def close end end +# tricky to test output buffering behavior across different OSes +def skip_skb_mem + return if ENV['YAHNS_TEST_FORCE'] + skip "linux-only test" unless RUBY_PLATFORM =~ /linux/ + [ [ '/proc/sys/net/ipv4/tcp_rmem', "4096 87380 6291456\n" ], + ['/proc/sys/net/ipv4/tcp_wmem', "4096 16384 4194304\n" ] + ].each do |file, expect| + val = IO.read(file) + val == expect or skip "#{file} had: #{val}expected: #{expect}" + end +end + require 'yahns' # needed for parallel (MT) tests) diff --git a/test/test_output_buffering.rb b/test/test_output_buffering.rb index ba3e94a..e1a23b7 100644 --- a/test/test_output_buffering.rb +++ b/test/test_output_buffering.rb @@ -219,6 +219,7 @@ def gplv3.each def test_client_timeout err = @err + skip_skb_mem apperr = tmpfile(%w(app .err)) cfg = Yahns::Config.new size = RAND.size * NR -- EW