X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F93storage_replication.t;h=161013b5fd6c3831c9e79781810cbcdbe5382694;hb=f15afa13598dd767ba9547328a31d4b98313a896;hp=3de346aee00cc6b3504c6c20205d0b1bb6a076be;hpb=7c7ae12e76a6d290d731b4a8d709f7eee587c879;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/93storage_replication.t b/t/93storage_replication.t
index 3de346a..161013b 100644
--- a/t/93storage_replication.t
+++ b/t/93storage_replication.t
@@ -6,10 +6,10 @@ use Test::Exception;
 use DBICTest;
 
 BEGIN {
-    eval "use Moose; use Test::Moose";
+    eval "use DBIx::Class::Storage::DBI::Replicated; use Test::Moose";
     plan $@
-        ? ( skip_all => 'needs Moose for testing' )
-        : ( tests => 80 );
+        ? ( skip_all => "Deps not installed: $@" )
+        : ( tests => 79 );
 }
 
 use_ok 'DBIx::Class::Storage::DBI::Replicated::Pool';
@@ -59,9 +59,13 @@ TESTSCHEMACLASSES: {
     ## Get the Schema and set the replication storage type
     
     sub init_schema {
+        # current SQLT SQLite producer does not handle DROP TABLE IF EXISTS, trap warnings here
+        local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /no such table.+DROP TABLE/ };
+
         my $class = shift @_;
-        
+
         my $schema = DBICTest->init_schema(
+            sqlite_use_file => 1,
             storage_type=>{
             	'::DBI::Replicated' => {
             		balancer_type=>'::Random',
@@ -245,6 +249,7 @@ $replicated
 $replicated->replicate;
 $replicated->schema->storage->replicants->{$replicant_names[0]}->active(1);
 $replicated->schema->storage->replicants->{$replicant_names[1]}->active(1);
+$replicated->schema->storage->pool->validate_replicants;
 
 ## Make sure we can read the data.
 
@@ -270,20 +275,6 @@ $replicated
         [ 7, "Watergate"],
     ]);
 
-SKIP: {
-    ## We can't do this test if we have a custom replicants, since we assume
-    ## if there are custom one that you are trying to test a real replicating
-    ## system.  See docs above for more.
-    
-    skip 'Cannot test inconsistent replication since you have a real replication system', 1
-     if DBICTest->has_custom_dsn && $ENV{"DBICTEST_SLAVE0_DSN"};
-    
-	## Alright, the database 'cluster' is not in a consistent state.  When we do
-	## a read now we expect bad news    
-    is $replicated->schema->resultset('Artist')->find(5), undef
-    => 'read after disconnect fails because it uses a replicant which we have neglected to "replicate" yet'; 
-}
-
 ## Make sure all the slaves have the table definitions
 $replicated->replicate;
 
@@ -365,6 +356,7 @@ ok $replicated->schema->resultset('Artist')->find(2)
 
 $replicated->schema->storage->replicants->{$replicant_names[0]}->active(1);
 $replicated->schema->storage->replicants->{$replicant_names[1]}->active(1);
+$replicated->schema->storage->pool->validate_replicants;
 
 ok $replicated->schema->resultset('Artist')->find(2)
     => 'Returned to replicates';
@@ -569,18 +561,18 @@ ok $replicated->schema->resultset('Artist')->find(1)
        => 'Got expected single result from transaction';	  
 }     
 
-## Test the reliable_storage resultset attribute.
+## Test the force_pool resultset attribute.
 
 {
 	ok my $artist_rs = $replicated->schema->resultset('Artist')
         => 'got artist resultset';
 	   
-	## Turn on Reliable Storage
-	ok my $reliable_artist_rs = $artist_rs->search(undef, {execute_reliably=>1})
-        => 'Created a resultset using reliable storage';
+	## Turn on Forced Pool Storage
+	ok my $reliable_artist_rs = $artist_rs->search(undef, {force_pool=>'master'})
+        => 'Created a resultset using force_pool storage';
 	   
     ok my $artist = $reliable_artist_rs->find(2) 
-        => 'got an artist result via reliable storage';
+        => 'got an artist result via force_pool storage';
 }
 
 ## Delete the old database files