merging

[urisagit/Stem.git] / t / event / event_test.pl

diff --git a/t/event/event_test.pl b/t/event/event_test.pl
index faefbfe..1615ff8 100644 (file)
--- a/t/event/event_test.pl
+++ b/t/event/event_test.pl
@@ -50,7 +50,7 @@ sub test_plain_events {
                'object' => $self
        ) ;
 
-       ok( ref $event, 'plain event created' ) ;
+       ok( ref $event, 'plain - event created' ) ;
 
        Stem::Event::start_loop() ;
 
@@ -63,8 +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 {
@@ -97,7 +101,7 @@ sub send_int_signal {
                        'signal'        => 'INT',
                ) ;
 
-               ok( ref $event, 'signal event created' ) ;
+               ok( ref $event, 'signal - event created' ) ;
 
                $self->{'sig_event'} = $event ;
 
@@ -113,7 +117,7 @@ sub sig_int_handler {
 
        my( $self ) = @_ ;
 
-       ok( 1, 'signal event triggered' ) ;
+       ok( 1, 'signal - event triggered' ) ;
 
        $self->{'sig_event'}->cancel() ;
        Stem::Event::stop_loop() ;
@@ -138,7 +142,7 @@ sub test_hard_timer_events {
                'hard'          => 1,
        ) ;
 
-       ok( ref $event, 'hard timer event created' ) ;
+       ok( ref $event, 'hard timer - event created' ) ;
        print "$event\n" unless ref $event ;
 
        $self->{'hard_timer_event'} = $event ;
@@ -154,9 +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 ) {
 
@@ -164,7 +172,7 @@ send_int_signal() ;
                my $delta = $time - $self->{'hard_timer_start_time'} ;
                $self->{'hard_timer_start_time'} = $time ;
 
-               ok( $delta >= INTERVAL, 'hard delta' ) ;
+               ok( $delta >= INTERVAL, 'hard timer - delta' ) ;
 
                hard_sleep( SLEEP ) ;
 
@@ -177,8 +185,8 @@ send_int_signal() ;
 
 #print "O $self->{'hard_timer_start_time'} T $time D $delta I ", INTERVAL, "\n" ;
 
-       ok( $delta >= INTERVAL, 'hard delta 2' ) ;
-       ok( $delta <= INTERVAL + SLEEP, 'hard delta sleep' ) ;
+       ok( $delta >= INTERVAL, 'hard timer - delta 2' ) ;
+       ok( $delta <= INTERVAL + SLEEP, 'hard timer - delta sleep' ) ;
 
        $self->{'hard_timer_event'}->cancel() ;
 
@@ -199,7 +207,7 @@ sub test_soft_timer_events {
                'repeat'        => 1,
        ) ;
 
-       ok( ref $event, 'soft timer event created' ) ;
+       ok( ref $event, 'soft timer - event created' ) ;
 #      print "$event\n" unless ref $event ;
 
        $self->{'soft_timer_event'} = $event ;
@@ -217,7 +225,7 @@ sub soft_timeout {
 
        my( $self ) = @_ ;
 
-       ok( 1, 'soft timer event triggered' ) ;
+       ok( 1, 'soft timer - event triggered' ) ;
 
        if ( --$self->{'soft_timer_count'} > 0 ) {
 
@@ -226,7 +234,7 @@ sub soft_timeout {
 
 #print "T $time D $delta I ", INTERVAL, "\n" ;
 
-               ok( $delta >= INTERVAL, 'soft delta' ) ;
+               ok( $delta >= INTERVAL, 'soft timer - delta' ) ;
 
                hard_sleep( SLEEP ) ;
 
@@ -241,8 +249,8 @@ sub soft_timeout {
 
 #print "TIME2 $time OTIME $self->{'soft_timer_start_time'} DEL $delta INTERVAL ", INTERVAL, "\n" ;
 
-#      ok( $delta >= INTERVAL, 'soft delta 2' ) ;
-       ok( $delta >= INTERVAL + SLEEP, 'soft delta 3' ) ;
+#      ok( $delta >= INTERVAL, 'soft timer - delta 2' ) ;
+       ok( $delta >= INTERVAL + SLEEP, 'soft timer - delta 3' ) ;
 
        $self->{'soft_timer_event'}->cancel() ;
 
@@ -273,7 +281,7 @@ sub test_io_events {
                                'timeout'       =>      3,
        ) ;
 
-       ok( ref $read_event, 'read event created' ) ;
+       ok( ref $read_event, 'read - event created' ) ;
        $self->{'read_event'} = $read_event ;
 
        my $write_event = Stem::Event::Write->new(
@@ -281,19 +289,19 @@ sub test_io_events {
                                'fh'            =>      $write_fh,
        ) ;
 
-       ok( ref $write_event, 'write event created' ) ;
+       ok( ref $write_event, 'write - event created' ) ;
        $self->{'write_event'} = $write_event ;
 
        Stem::Event::start_loop() ;
 
-       ok( 1, 'io - event loop exit' ) ;
+       ok( 1, 'io event - loop exit' ) ;
 }
 
 sub read_timeout {
 
        my( $self ) = @_ ;
 
-       ok( 1, 'read event timed out' ) ;
+       ok( 1, 'read - event timed out' ) ;
 
        $self->{'write_event'}->start() ;
 }
@@ -303,7 +311,7 @@ sub writeable {
 
        my( $self ) = @_ ;
 
-       ok( 1, 'write event triggered' ) ;
+       ok( 1, 'write - event triggered' ) ;
 
        syswrite( $self->{'write_fh'}, $self->{'message'} ) ;
 
@@ -314,13 +322,13 @@ sub readable {
 
        my( $self ) = @_ ;
 
-       ok(1, 'read event triggered' ) ;
+       ok(1, 'read - event triggered' ) ;
 
        my( $read_buf ) ;
 
        my $bytes_read = sysread( $self->{'read_fh'}, $read_buf, 1000 ) ;
 
-       ok( $bytes_read, 'read byte count' ) ;
+       ok( $bytes_read, 'read - byte count' ) ;
 
        is( $read_buf, $self->{'message'}, 'read event compare' ) ;