Run the entire test suite under replicated SQLite on DBICTEST_VIA_REPLICATED

[dbsrgits/DBIx-Class.git] / t / storage / base.t

diff --git a/t/storage/base.t b/t/storage/base.t
index efc5938..451f7e6 100644 (file)
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -10,11 +10,13 @@ use Data::Dumper;
 
 my $schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
-is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
-    'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite' );
-
 my $storage = $schema->storage;
-$storage->ensure_connected;
+
+is(
+  ref($storage),
+  'DBIx::Class::Storage::DBI::SQLite',
+  'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite'
+) unless $ENV{DBICTEST_VIA_REPLICATED};
 
 throws_ok {
     $schema->storage->throw_exception('test_exception_42');
@@ -146,13 +148,15 @@ for my $type (keys %$invocations) {
   );
 }
 
+$schema->storage->_dbh->disconnect;
+
 # make sure connection-less storages do not throw on _determine_driver
 # but work with ENV at the same time
 SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {
   skip 'Subtest relies on being connected to SQLite', 1
     if $env_dsn and $env_dsn !~ /\:SQLite\:/;
 
-  local $ENV{DBI_DSN} = $env_dsn;
+  local $ENV{DBI_DSN} = $env_dsn || '';
 
   my $s = DBICTest::Schema->connect();
   is_deeply (
@@ -164,7 +168,7 @@ SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {
 
   my $sm = $s->storage->sql_maker;
 
-  ok (! $s->storage->connected, 'Storage does not appear connected (SQLite determined by DSN-only analysis)');
+  ok (! $s->storage->connected, 'Storage does not appear connected after SQLMaker instance is taken');
 
   if ($env_dsn) {
     isa_ok($sm, 'DBIx::Class::SQLMaker');