yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
* [PATCH] proxy_pass: skip tests if kcar is missing
@ 2015-06-09 20:22 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-06-09 20:22 UTC (permalink / raw)
  To: yahns-public

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 <yahns-public@yhbt.net>
 # 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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-06-09 20:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-09 20:22 [PATCH] proxy_pass: skip tests if kcar is missing Eric Wong

Code repositories for project(s) associated with this inbox:

	../../../yahns.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).