diff options
| author | Eric Wong <e@80x24.org> | 2020-12-15 08:21:24 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2020-12-19 09:32:08 +0000 |
| commit | d42172638f5479f76e73470ad48a679100c3e0d5 (patch) | |
| tree | f934fbc068bfc9135fa80d7046c47086a4da4771 | |
| parent | 6cdb84af2c75b3c66a35c8c4973f455da15dd0a4 (diff) | |
| download | public-inbox-d42172638f5479f76e73470ad48a679100c3e0d5.tar.gz | |
We'll probably be using JSON more in the future, so make it easier to require in tests
| -rw-r--r-- | lib/PublicInbox/ManifestJsGz.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/TestCommon.pm | 4 | ||||
| -rw-r--r-- | t/extsearch.t | 3 | ||||
| -rw-r--r-- | t/lei.t | 3 | ||||
| -rw-r--r-- | t/www_listing.t | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/PublicInbox/ManifestJsGz.pm b/lib/PublicInbox/ManifestJsGz.pm index 6d5b57ee..33df020a 100644 --- a/lib/PublicInbox/ManifestJsGz.pm +++ b/lib/PublicInbox/ManifestJsGz.pm @@ -11,7 +11,7 @@ use PublicInbox::Config; use IO::Compress::Gzip qw(gzip); use HTTP::Date qw(time2str); -our $json = PublicInbox::Config::json(); +my $json = PublicInbox::Config::json(); # called by WwwListing sub url_regexp { diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 299b9c6a..2116575b 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -75,6 +75,10 @@ sub require_mods { my $maybe = pop @mods if $mods[-1] =~ /\A[0-9]+\z/; my @need; while (my $mod = shift(@mods)) { + if ($mod eq 'json') { + $mod = 'Cpanel::JSON::XS||JSON::MaybeXS||'. + 'JSON||JSON::PP' + } if ($mod eq 'Search::Xapian') { if (eval { require PublicInbox::Search } && PublicInbox::Search::load_xapian()) { diff --git a/t/extsearch.t b/t/extsearch.t index fb31b0ab..ffbc10e2 100644 --- a/t/extsearch.t +++ b/t/extsearch.t @@ -8,9 +8,8 @@ use PublicInbox::Config; use PublicInbox::Search; use PublicInbox::InboxWritable; use Fcntl qw(:seek); -my $json = PublicInbox::Config::json() or plan skip_all => 'JSON missing'; require_git(2.6); -require_mods(qw(DBD::SQLite Search::Xapian)); +require_mods(qw(json DBD::SQLite Search::Xapian)); use_ok 'PublicInbox::ExtSearch'; use_ok 'PublicInbox::ExtSearchIdx'; use_ok 'PublicInbox::OverIdx'; @@ -6,8 +6,7 @@ use v5.10.1; use Test::More; use PublicInbox::TestCommon; use PublicInbox::Config; -my $json = PublicInbox::Config::json() or plan skip_all => 'JSON missing'; -require_mods(qw(DBD::SQLite Search::Xapian)); +require_mods(qw(json DBD::SQLite Search::Xapian)); my ($home, $for_destroy) = tmpdir(); my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') }; diff --git a/t/www_listing.t b/t/www_listing.t index 63613371..94c1e5bb 100644 --- a/t/www_listing.t +++ b/t/www_listing.t @@ -7,14 +7,12 @@ use Test::More; use PublicInbox::Spawn qw(which); use PublicInbox::TestCommon; use PublicInbox::Import; -require_mods(qw(URI::Escape Plack::Builder Digest::SHA +require_mods(qw(json URI::Escape Plack::Builder Digest::SHA IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny)); require PublicInbox::WwwListing; require PublicInbox::ManifestJsGz; -my $json = do { - no warnings 'once'; - $PublicInbox::ManifestJsGz::json; -} or plan skip_all => "JSON module missing"; +use PublicInbox::Config; +my $json = PublicInbox::Config::json(); use_ok 'PublicInbox::Git'; |