Fix tests dying in absence of bootstrap scripts.

wchristian · Aug 13, 2010 · df62926 · df62926
1 parent 4e3ae73
commit df62926
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 13 deletions.
diff --git a/t/01app.t b/t/01app.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist;
 

diff --git a/t/02git_CollectionOfRepositories_FromDirectory.t b/t/02git_CollectionOfRepositories_FromDirectory.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
 use Test::More qw/no_plan/;

diff --git a/t/02git_Repository.t b/t/02git_Repository.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
 use Test::More qw/no_plan/;

diff --git a/t/02git_object.t b/t/02git_object.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/02git_util.t b/t/02git_util.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
 use Test::More;

diff --git a/t/03legacy_uri.t b/t/03legacy_uri.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist qw/request curry_test_uri done_testing ok is $TODO/;
 

diff --git a/t/app-mech-rootpage.t b/t/app-mech-rootpage.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist;
 plan 'skip_all' => "One or more of the following modules aren't present: Test::WWW::Mechanize::Catalyst WWW::Mechanize::TreeBuilder HTML::TreeBuilder::XPath" unless MECH();

diff --git a/t/atom.t b/t/atom.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist;
 use HTTP::Request::Common;

diff --git a/t/model_collectionofrepos.t b/t/model_collectionofrepos.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use strict;
 use warnings;
 

diff --git a/t/opml.t b/t/opml.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist;
 use HTTP::Request::Common;

diff --git a/t/rss.t b/t/rss.t
@@ -1,6 +1,12 @@
 #!/usr/bin/env perl
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 use lib "$Bin/lib";
 use TestGitalist;
 use HTTP::Request::Common;

diff --git a/t/scripts.t b/t/scripts.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 
 use strict;
 use warnings;

diff --git a/t/view_Default.t b/t/view_Default.t
@@ -1,5 +1,11 @@
 use FindBin qw/$Bin/;
-BEGIN { do "$FindBin::Bin/../script/env" or die $@ }
+BEGIN {
+    my $env = "$FindBin::Bin/script/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
+}
+
 
 use strict;
 use warnings;