clean up forking/cleanup for clean harness testing

[scpubgit/Test-Harness-Selenium.git] / lib / Test / Harness / Selenium.pm

diff --git a/lib/Test/Harness/Selenium.pm b/lib/Test/Harness/Selenium.pm
index d4eda0e..3590be0 100644 (file)
--- a/lib/Test/Harness/Selenium.pm
+++ b/lib/Test/Harness/Selenium.pm
@@ -1,12 +1,14 @@
 package Test::Harness::Selenium;
 use strictures 1;
 
-use File::Find;
+use File::Find::Rule;
 use Socialtext::WikiFixture::Selenese;
 use HTML::TableExtract;
 use IO::All;
+use Alien::SeleniumRC;
+use LWP::Simple;
 
-use Test::Builder;
+use Test::More;
 BEGIN {
   package Test::Builder;
 
@@ -32,22 +34,61 @@ sub new {
   bless $self, $class;
 }
 
+sub start_server {
+  my($self) = @_;
+  $self->{server_pid} = fork();
+  if(!defined $self->{server_pid}) {
+    die "can't fork: $!";
+  }
+  if($self->{server_pid} > 0) {
+    my $tries = 0;
+    while($tries < 5) {
+      eval {
+        $self->{src} = Socialtext::WikiFixture::Selenese->new(
+          host => $self->{host},
+          port => $self->{port},
+          browser => $self->{browser},
+          browser_url => $self->{browser_url},
+        );
+      };
+      $tries++;
+      if(!defined $self->{src}) {
+        sleep 10;
+      }
+      else {
+        last;
+      }
+    }
+    die "timed out waiting for selenium server to start" if $tries == 5;
+  }
+  elsif($self->{server_pid} == 0) {
+    # muttermutter, can't specify a host for selenium
+    exec("$^X -MAlien::SeleniumRC -e 'Alien::SeleniumRC::start(q{-port $self->{port}})'");
+  }
+}
+
+sub stop_server {
+  my($self) = @_;
+  # okay, we're done, kill the server.
+  get("http://localhost:$self->{port}/selenium-server/driver/?cmd=shutDownSeleniumServer");
+  delete $self->{src};
+  wait;
+}
+
 sub test_directory {
   my ($self, $dir) = @_;
   my @tests = File::Find::Rule->file()->name('*.html')->in($dir);
-  $self->run_tests_for($_) for @tests;
+  for my $test (@tests) {
+    $self->start_server;
+    $self->run_tests_for($test);
+    $self->stop_server;
+  }
 }
 
 sub run_tests_for {
   my ($self, $html_file) = @_;
   my $rows = $self->get_rows_for($html_file);
-  my $src = Socialtext::WikiFixture::Selenese->new(
-    host => $self->{host},
-    port => $self->{port},
-    browser => $self->{browser},
-    browser_url => $self->{browser_url},
-  );
-  $src->run_test_table($rows);
+  $self->{src}->run_test_table($rows);
 }
 
 my $te = HTML::TableExtract->new;
@@ -57,8 +98,8 @@ sub get_rows_for {
   $te->parse($html);
   my $table = ($te->tables)[0];
   my @rows = map {
-    [ map { $_ eq "\240" ? () : $_ } @$_ ]
-  } $table->rows;
+    [ map { (!defined $_ or $_ eq "\240") ? () : $_ } @$_ ]
+  } grep { defined $_->[1] } $table->rows;
   return \@rows;
 }