Skip to content

Commit

Permalink
Fix Exasol and Firebird test errors
Browse files Browse the repository at this point in the history
Plug a few more holes in the expectation that Sqitch always raises
App::Sqitch::X objects rather than strings, as discovered by some
unanticipated test configurations (resolves #858). Also fix a couple of
typos and the default URI for Exasol tests.
  • Loading branch information
theory committed Jan 15, 2025
1 parent 11de9e1 commit 3c62314
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Revision history for Perl extension App::Sqitch

1.5.1 Note yet released
1.5.1 Not yet released

1.5.0 2025-01-08T03:22:40
- Fix improperly nested Pod headers that were incrementing two levels
Expand Down
2 changes: 1 addition & 1 deletion t/exasol.t
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ END {
$uri = URI->new(
$ENV{SQITCH_TEST_EXASOL_URI} ||
$ENV{EXA_URI} ||
'db:dbadmin:password@localhost/dbadmin'
'db:exasol://dbadmin:password@localhost/dbadmin'
);
my $err;
for my $i (1..30) {
Expand Down
8 changes: 5 additions & 3 deletions t/firebird.t
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ my $uri;
my $tmpdir;
my $have_fb_driver = 1; # assume DBD::Firebird is installed and so is Firebird

# Is DBD::Firebird realy installed?
# Is DBD::Firebird really installed?
try { require DBD::Firebird; } catch { $have_fb_driver = 0; };

BEGIN {
Expand Down Expand Up @@ -472,11 +472,13 @@ DBIEngineTest->run(
# DBD::Firebird.
my $cmd = $self->client;
my $cmd_echo = qx(echo "quit;" | "$cmd" -z -quiet 2>&1 );
return 0 unless $cmd_echo =~ m{Firebird}ims;
App::Sqitch::X::hurl('isql not for Firebird')
unless $cmd_echo =~ m{Firebird}ims;
chomp $cmd_echo;
say "# Detected $cmd_echo";
# Skip if no DBD::Firebird.
return 0 unless $have_fb_driver;
App::Sqitch::X::hurl('DBD::Firebird did not load')
unless $have_fb_driver;
say "# Connected to Firebird $fb_version" if $fb_version;
return 1;
},
Expand Down
2 changes: 1 addition & 1 deletion t/lib/DBIEngineTest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ sub run {
);
if (my $code = $p{skip_unless}) {
try {
$code->( $engine ) || die 'NO';
$code->( $engine ) || App::Sqitch::X::hurl('NO');
} catch {
plan skip_all => sprintf(
'Unable to live-test %s engine: %s',
Expand Down

0 comments on commit 3c62314

Please sign in to comment.