X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fevent%2Fevent_test.pl;h=a1d18c94d031d3e230d266cdfeb656747fd7fe2c;hb=907cbc6d770ea6bf36c1649d1952caaccf17d420;hp=1615ff874e1906f4776c26624dd5a86740834d6e;hpb=edf7663cc9a0a4654ba0dd48662c280a9a4dba4f;p=urisagit%2FStem.git

diff --git a/t/event/event_test.pl b/t/event/event_test.pl
index 1615ff8..a1d18c9 100644
--- a/t/event/event_test.pl
+++ b/t/event/event_test.pl
@@ -62,13 +62,7 @@ sub test_plain_events {
 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 {
@@ -80,22 +74,6 @@ 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',
@@ -103,12 +81,14 @@ sub send_int_signal {
 
 		ok( ref $event, 'signal - event created' ) ;
 
-		$self->{'sig_event'} = $event ;
+		kill 'INT', $$ ;
 
+		$self->{'sig_event'} = $event ;
 
-print "kill INT\n" ;
+		Stem::Event::start_loop() ;
 
-	kill 'INT', $$ ;
+		ok( 1, 'signal - event loop exit' ) ;
+	}
 }
 
 # callback method for signal
@@ -120,6 +100,7 @@ sub sig_int_handler {
 	ok( 1, 'signal - event triggered' ) ;
 
 	$self->{'sig_event'}->cancel() ;
+
 	Stem::Event::stop_loop() ;
 }
 
@@ -158,13 +139,7 @@ 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 ) {