From: Eric Wong <bofh@yhbt.net>
To: raindrops-public@yhbt.net
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH 1/4] tests: support running tests without rack||aggregate
Date: Fri, 29 Dec 2023 17:50:18 +0000 [thread overview]
Message-ID: <20231229175021.17727-2-bofh@yhbt.net> (raw)
In-Reply-To: <20231229175021.17727-1-bofh@yhbt.net>
From: Eric Wong <e@80x24.org>
Diskspace and bandwidth are expensive, and we can make
rack+aggregate optional in tests, too.
---
test/rack_unicorn.rb | 3 +--
test/test_last_data_recv.rb | 8 +++++++-
test/test_watcher.rb | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/test/rack_unicorn.rb b/test/rack_unicorn.rb
index 779e8bf..0ecbd42 100644
--- a/test/rack_unicorn.rb
+++ b/test/rack_unicorn.rb
@@ -1,11 +1,10 @@
# -*- encoding: binary -*-
require "test/unit"
require "raindrops"
-require "rack"
-require "rack/lobster"
require "open-uri"
begin
require "unicorn"
+ require "rack"
require "rack/lobster"
rescue LoadError => e
warn "W: #{e} skipping test since Rack or Unicorn was not found"
diff --git a/test/test_last_data_recv.rb b/test/test_last_data_recv.rb
index ef84e05..b1a5ac6 100644
--- a/test/test_last_data_recv.rb
+++ b/test/test_last_data_recv.rb
@@ -1,3 +1,9 @@
+begin
+ require 'aggregate'
+ have_aggregate = true
+rescue LoadError => e
+ warn "W: #{e} skipping #{__FILE__}"
+end
require 'test/unit'
require 'raindrops'
require 'io/wait'
@@ -40,4 +46,4 @@ def test_accept_nonblock_one
assert_equal 1, s.raindrops_aggregate.size
assert_raise(IO::WaitReadable) { s.accept_nonblock }
end
-end if RUBY_PLATFORM =~ /linux/
+end if RUBY_PLATFORM =~ /linux/ && have_aggregate
diff --git a/test/test_watcher.rb b/test/test_watcher.rb
index 28ac49b..e5d1fa2 100644
--- a/test/test_watcher.rb
+++ b/test/test_watcher.rb
@@ -1,9 +1,9 @@
# -*- encoding: binary -*-
require "test/unit"
-require "rack"
require "raindrops"
begin
require 'aggregate'
+ require 'rack'
rescue LoadError => e
warn "W: #{e} skipping #{__FILE__}"
end
@@ -183,4 +183,4 @@ def test_peaks
assert_equal queued_before, headers["X-Last-Peak-At"], "should not change"
assert_equal start, headers["X-First-Peak-At"]
end
-end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate)
+end if RUBY_PLATFORM =~ /linux/ && defined?(Aggregate) && defined?(Rack)
next prev parent reply other threads:[~2023-12-29 17:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-29 17:50 [PATCH 0/4] lighter tests + rack 3 dependency fix Eric Wong
2023-12-29 17:50 ` Eric Wong [this message]
2023-12-29 17:50 ` [PATCH 2/4] test/test_last_data_recv: don't require posix_mq Eric Wong
2023-12-29 17:50 ` [PATCH 3/4] extconf: disable optimization to speed up checks by ~3% Eric Wong
2023-12-29 17:50 ` [PATCH 4/4] gemspec: support rack 3.x Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/raindrops/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231229175021.17727-2-bofh@yhbt.net \
--to=bofh@yhbt.net \
--cc=e@80x24.org \
--cc=raindrops-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/raindrops.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).