--- EV/t/02_once.t	2008/03/22 23:55:22	1.6
+++ EV/t/02_once.t	2010/10/28 04:59:35	1.12
@@ -1,4 +1,11 @@
-BEGIN { $| = 1; print "1..6\n"; }
+BEGIN {
+   if (exists $ENV{AUTOMATED_TESTING}) {
+      print "1..0 # Skipped: Too many broken cpan tester setups.\n";
+      exit;
+   }
+}
+
+BEGIN { $| = 1; print "1..30\n"; }
 
 no warnings;
 use strict;
@@ -6,18 +13,29 @@
 
 use EV;
 
-for my $i (3..5) {
-   EV::once undef, 0, $i * 0.4, sub {
-      print $_[0] == EV::TIMEOUT ? "" : "not ", "ok $i\n";
+for my $it ("", 1, 2) {
+   for my $i (3..5) {
+      EV::once undef, 0, ($i - 3) * 0.1 + 0.2, sub {
+         print $_[0] == EV::TIMER ? "" : "not ", "ok $it$i\n";
+      };
+   }
+
+   socketpair my $s1, my $s2, AF_UNIX, SOCK_STREAM, PF_UNSPEC;
+
+   EV::once $s1, EV::WRITE, 0.1, sub {
+      print $_[0] & EV::WRITE ? "" : "not ", "ok ${it}2\n";
    };
-}
 
-socketpair my $s1, my $s2, AF_UNIX, SOCK_STREAM, PF_UNSPEC;
+   print "ok ${it}1\n";
+   EV::run;
+   print "ok ${it}6\n";
+   EV::signal INT => sub { };
+   print "ok ${it}7\n";
+   EV::async sub { };
+   print "ok ${it}8\n";
+   EV::default_destroy;
+   print "ok ${it}9\n";
+   EV::default_loop;
+   print "ok ", ${it}*10 + 10, "\n";
+}
 
-EV::once $s1, EV::WRITE, 0.8, sub {
-   print $_[0] & EV::WRITE ? "" : "not ", "ok 2\n";
-};
-
-print "ok 1\n";
-EV::loop;
-print "ok 6\n";