Bug 1455495 - Replace apache with Mojolicious

2 files changed, 11 insertions, 10 deletions

diff --git a/t/001compile.t b/t/001compile.t
index e81162056..3d8d82bf4 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -35,7 +35,7 @@ sub compile_file {
     my ($file) = @_;
 
     # Don't allow CPAN.pm to modify the global @INC, which the version
-    # shipped with Perl 5.8.8 does. (It gets loaded by 
+    # shipped with Perl 5.8.8 does. (It gets loaded by
     # Bugzilla::Install::CPAN.)
     local @INC = @INC;
 
@@ -43,10 +43,6 @@ sub compile_file {
         skip "$file: extensions not tested",  1;
         return;
     }
-    if ($file =~ /ModPerl/) {
-       skip "$file: ModPerl stuff not tested", 1;
-       return;
-    }
 
     if ($file =~ s/\.pm$//) {
         $file =~ s{/}{::}g;
@@ -82,7 +78,7 @@ my $file_features = map_files_to_features();
 # Test the scripts by compiling them
 foreach my $file (@testitems) {
     # These were already compiled, above.
-    next if ($file eq 'Bugzilla.pm' 
+    next if ($file eq 'Bugzilla.pm'
              or $file eq 'Bugzilla/Constants.pm'
              or $file eq 'Bugzilla/Install/Requirements.pm');
     SKIP: {
@@ -94,10 +90,10 @@ foreach my $file (@testitems) {
             skip "$file: $feature not enabled", 1;
         }
 
-        # Check that we have a DBI module to support the DB, if this 
+        # Check that we have a DBI module to support the DB, if this
         # is a database module (but not Schema)
         if ($file =~ m{Bugzilla/DB/([^/]+)\.pm$}
-            and $file ne "Bugzilla/DB/Schema.pm") 
+            and $file ne "Bugzilla/DB/Schema.pm")
         {
             my $module = lc($1);
             Bugzilla->feature($module) or skip "$file: Driver for $module not installed", 1;
@@ -105,4 +101,4 @@ foreach my $file (@testitems) {
 
         compile_file($file);
     }
-}      
+}
diff --git a/t/002goodperl.t b/t/002goodperl.t
index 5f201160b..80d7cf2b9 100644
--- a/t/002goodperl.t
+++ b/t/002goodperl.t
@@ -83,6 +83,7 @@ foreach my $file (@testitems) {
     my $found_use_strict = 0;
     my $found_use_warnings = 0;
     my $found_modern_perl = 0;
+    my $found_mojo = 0;
 
     $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
     next if (!$file); # skip null entries
@@ -92,13 +93,17 @@ foreach my $file (@testitems) {
     }
     while (my $file_line = <FILE>) {
         $found_modern_perl = 1 if $file_line =~ m/^use\s*(?:Moo|Role::Tiny)/;
+        $found_mojo = 1 if $file_line =~ m/^use\s(?:Mojo(?:licious::Lite|::Base)\b)/;
         $found_use_perl = 1 if $file_line =~ m/^\s*use 5.10.1/;
         $found_use_strict = 1 if $file_line =~ m/^\s*use strict/;
         $found_use_warnings = 1 if $file_line =~ m/^\s*use warnings/;
-        if ($found_modern_perl) {
+        if ($found_modern_perl || $found_mojo) {
             $found_use_strict = 1;
             $found_use_warnings = 1;
         }
+        if ($found_mojo) {
+            $found_use_perl = 1;
+        }
         last if ($found_use_perl && $found_use_strict && $found_use_warnings);
     }
     close (FILE);