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: X-Spam-Status: No, score=-2.4 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, URIBL_BLOCKED shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: yahns-public@yhbt.net Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id CA2911F4A2 for ; Tue, 9 Jun 2015 20:22:18 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] proxy_pass: skip tests if kcar is missing Date: Tue, 9 Jun 2015 20:22:18 +0000 Message-Id: <1433881338-29759-1-git-send-email-e@80x24.org> List-Id: We don't require kcar to be installed since most users will never use the proxy_pass feature, but show an informative error in case they want to test this functionality. --- test/test_extras_proxy_pass.rb | 5 +++++ test/test_proxy_pass.rb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/test/test_extras_proxy_pass.rb b/test/test_extras_proxy_pass.rb index 495a920..851b6aa 100644 --- a/test/test_extras_proxy_pass.rb +++ b/test/test_extras_proxy_pass.rb @@ -1,6 +1,10 @@ # Copyright (C) 2015 all contributors # License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt) require_relative 'server_helper' +begin + require 'kcar' +rescue LoadError +end class TestExtrasProxyPass < Testcase ENV["N"].to_i > 1 and parallelize_me! @@ -27,6 +31,7 @@ class TestExtrasProxyPass < Testcase def setup @srv2 = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0) server_helper_setup + skip "kcar missing for extras/proxy_pass" unless defined?(Kcar) end def teardown diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb index a27a45e..7f752e3 100644 --- a/test/test_proxy_pass.rb +++ b/test/test_proxy_pass.rb @@ -3,6 +3,10 @@ require_relative 'server_helper' require 'json' require 'digest' +begin + require 'kcar' +rescue LoadError +end class TestProxyPass < Testcase ENV["N"].to_i > 1 and parallelize_me! @@ -163,6 +167,7 @@ class TestProxyPass < Testcase def setup @srv2 = TCPServer.new(ENV["TEST_HOST"] || "127.0.0.1", 0) server_helper_setup + skip "kcar missing yahns/proxy_pass" unless defined?(Kcar) end def teardown -- EW