Changeset 209711be5bf2a026e9d8d04fef2e05aaeb77c884

Timestamp:

07/07/11 00:52:46 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1309999966 -0400

git-parent:

[f0993ef416e0aff2c8202768888e85660d83ae6f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1309999966 -0400

Message:

Sigh. cwd() can hang sometimes on Mac after you've fork()ed.

Files:

• test/t/testconfig.pm (modified) (8 diffs)

test/t/testconfig.pm

@@ -9 +9 @@
-use strict;
-use vars qw/@EXPORT/;
+sub mkL {
+  my $fd = $_[0];
+  return sub {} unless $ENV{DEBUG_TESTS};
+  return sub { print $fd "[$$] $_[0]\n"; }
+};
+sub childL {
+  open my $olderr, ">&STDERR";
+  { no warnings 'redefine'; *L = mkL($olderr); }
+}
+*L = mkL(\*STDERR);
-
-my $noit_pid = 0;
@@ -258 +268 @@
-  my $name = shift;
-  my $options = shift;
-
+get
-  $options->{modules} = $all_noit_modules unless exists($options->{modules});
-  $options->{filtersets} = $default_filterset unless exists($options->{filtersets});
@@ -463 +473 @@
-  my $name = shift;
-  my $options = shift;
-
+
+
+
-  $options->{generics} ||= { 'stomp_driver' => { image => 'stomp_driver' },
-                             'postgres_ingestor' => { image => 'postgres_ingestor' } };
@@ -470 +482 @@
-  my $cwd = $options->{cwd};
-  my $file = "$cwd/logs/${name}_stratcon.conf";
+  L("make_stratcon_config -> open($file)");
-  open (my $o, ">$file") || BAIL_OUT("can't write config: $file");
-  print $o qq{<?xml version="1.0" encoding="utf8" standalone="yes"?>\n};
@@ -482 +495 @@
-  make_iep_config($o, $options);
-  print $o qq{</stratcon>\n};
+  L("make_stratcon_config -> close($file)");
-  close($o);
-  return $file;
@@ -497 +511 @@
-  $options->{name} = $name;
-  return 0 if $noit_pid;
+  L("start_noit -> config");
-  my $conf = make_noit_config($name, $options);
-  $noit_pid = fork();
+  L("noit_pid -> $noit_pid") if ($noit_pid);
-  mkdir "logs";
-  $noit_log = "logs/${name}_noit.log";
-  if($noit_pid == 0) {
+    L("in child");
+    childL;
-    $noit_pid = $$;
-    $noit_log = "logs/${name}_noit.log";
+    L("in child -> closing stdin");
-    close(STDIN);
+    L("in child -> opening stdin");
-    open(STDIN, "</dev/null");
+    L("in child -> closing stdout");
-    close(STDOUT);
+    L("in child -> opening stdout");
-    open(STDOUT, ">/dev/null");
+    L("in child -> closing stderr");
-    close(STDERR);
+    L("in child -> opening err $noit_log");
-    open(STDERR, ">$noit_log");
-    my @args = ( 'noitd', '-D', '-c', $conf );
+    L("in child -> exec");
-    exec { '../../src/noitd' } @args;
-    exit(-1);
-  }
+  L("in parent -> noitd($noit_pid)");
-  return $noit_pid;
-}
@@ -531 +557 @@
-  $options->{name} = $name;
-  return 0 if $stratcon_pid;
+  L("start_stratcon -> config");
-  my $conf = make_stratcon_config($name, $options);
+  L("start_stratcon -> config($conf)");
-  $stratcon_pid = fork();
+  L("stratcon_pid -> $stratcon_pid") if($stratcon_pid);
-  mkdir "logs";
-  $stratcon_log = "logs/${name}_stratcon.log";
-  if($stratcon_pid == 0) {
+    L("in child");
+    childL;
-    $stratcon_pid = $$;
-    $stratcon_log = "logs/${name}_stratcon.log";
@@ -545 +576 @@
-    open(STDERR, ">$stratcon_log");
-    my @args = ( 'stratcond', '-D', '-c', $conf );
+    L("in child -> exec");
-    exec { '../../src/stratcond' } @args;
-    exit(-1);