X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fevent%2Fevent_test.pl;h=1615ff874e1906f4776c26624dd5a86740834d6e;hb=d88e43718237ee11b2a4458ed280dccfe6aea2d7;hp=4f5490652d74e21ceba45811555ec38d0242f01e;hpb=6b7be1100e75ca4ac0b5b9a3811dee268fafe2b6;p=urisagit%2FStem.git

diff --git a/t/event/event_test.pl b/t/event/event_test.pl
index 4f54906..1615ff8 100644
--- a/t/event/event_test.pl
+++ b/t/event/event_test.pl
@@ -63,7 +63,12 @@ sub triggered {
 
 	my( $self ) = @_ ;
 
+<<<<<<< HEAD:t/event/event_test.pl
 	ok( 1, 'plain - event triggered' ) ;
+=======
+	ok( 1, 'plain event triggered' ) ;
+	Stem::Event::stop_loop() ;
+>>>>>>> master:t/event/event_test.pl
 }
 
 sub test_signal_events {
@@ -75,6 +80,22 @@ sub test_signal_events {
 			return ;
 		}
 
+		my $event2 = Stem::Event::Timer->new(
+			'object'	=> $self,
+			'method'	=> 'send_int_signal',
+			'delay'		=> 3,
+		) ;
+
+		ok( ref $event2, 'signal delay timer created' ) ;
+
+		Stem::Event::start_loop() ;
+
+		ok( 1, 'signal - event loop exit' ) ;
+	}
+}
+
+sub send_int_signal {
+
 		my $event = Stem::Event::Signal->new(
 			'object'	=> $self,
 			'signal'	=> 'INT',
@@ -84,14 +105,10 @@ sub test_signal_events {
 
 		$self->{'sig_event'} = $event ;
 
-		kill 'INT', $$ ;
-
-#print "kill INT\n" ;
 
-		Stem::Event::start_loop() ;
+print "kill INT\n" ;
 
-		ok( 1, 'signal - event loop exit' ) ;
-	}
+	kill 'INT', $$ ;
 }
 
 # callback method for signal
@@ -141,7 +158,13 @@ sub hard_timeout {
 
 	my( $self ) = @_ ;
 
+<<<<<<< HEAD:t/event/event_test.pl
 	ok( 1, 'hard timer - event triggered' ) ;
+=======
+send_int_signal() ;
+
+	ok( 1, 'hard timer event triggered' ) ;
+>>>>>>> master:t/event/event_test.pl
 
 	if ( --$self->{'hard_timer_count'} > 0 ) {