X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_rt41083.t;h=ba99fe56684df3db7f618fdce369edb513be0c92;hb=f2f4bfec642363ab55cb3aa44e155c12ef06db9a;hp=facb70fa2a1b5d48bde0495812f30bb3311efaae;hpb=e9c270c5e1e031c7ab0bd733304e8f240d05c5d2;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t
index facb70f..ba99fe5 100644
--- a/t/39load_namespaces_rt41083.t
+++ b/t/39load_namespaces_rt41083.t
@@ -6,7 +6,13 @@ use Test::More;
 
 use lib 't/lib';
 
-plan tests => 2;
+plan tests => 4;
+
+sub _chk_warning {
+	defined $_[0]? 
+		$_[0] !~ qr/We found ResultSet class '([^']+)' for '([^']+)', but it seems that you had already set '([^']+)' to use '([^']+)' instead/ :
+		1
+}
 
 my $warnings;
 eval {
@@ -14,14 +20,23 @@ eval {
     package DBICNSTest::RtBug41083;
     use base 'DBIx::Class::Schema';
     __PACKAGE__->load_namespaces(
+	result_namespace => 'Schema_A',
+	resultset_namespace => 'ResultSet_A',
+	default_resultset_class => 'ResultSet'
+    );
+};
+ok(!$@) or diag $@;
+ok(_chk_warning($warnings), 'expected no complaint');
+
+eval {
+    local $SIG{__WARN__} = sub { $warnings .= shift };
+    package DBICNSTest::RtBug41083;
+    use base 'DBIx::Class::Schema';
+    __PACKAGE__->load_namespaces(
 	result_namespace => 'Schema',
 	resultset_namespace => 'ResultSet',
 	default_resultset_class => 'ResultSet'
     );
 };
 ok(!$@) or diag $@;
-ok(
-	$warnings !~
-	qr/We found ResultSet class '([^']+)' for '([^']+)', but it seems that you had already set '([^']+)' to use '([^']+)' instead/,
-	'Proxy sub class did not generate an error'
-);
+ok(_chk_warning($warnings), 'expected no complaint') or diag $warnings;