From 9fd62a17c756cf293cf63d56f3040a530800353e Mon Sep 17 00:00:00 2001 From: Elizabeth Mattijsen Date: Sun, 6 Dec 2015 10:18:23 +0100 Subject: [PATCH] Adapt tests because of 2a635cd96279ace1c5d3d6d687 --- S17-scheduler/basic.t | 22 +++++----------------- S17-scheduler/every.t | 12 +++++++++++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/S17-scheduler/basic.t b/S17-scheduler/basic.t index eea48ba967..73291c9e55 100644 --- a/S17-scheduler/basic.t +++ b/S17-scheduler/basic.t @@ -1,7 +1,7 @@ use v6; use Test; -plan 40; +plan 34; # real scheduling here my $name = $*SCHEDULER.^name; @@ -77,14 +77,8 @@ ok $*SCHEDULER ~~ Scheduler, "$name does Scheduler role"; "$name cannot combine :catch with :in and :at"; dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :at(now + 2), :in(1)), :catch({...}) }, "$name cannot combine :every/:catch with :in and :at"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10)) }, - "$name cannot combine :every and :times"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :at(now + 2)) }, - "$name cannot combine :every and :times with :at"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :in(1)) }, - "$name cannot combine :every and :times with :in"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :catch({...})) }, - "$name cannot combine :every and :times with :catch"; + dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :stop({...})) }, + "$name cannot combine :every, :times and :stop"; } # fake scheduling from here on out @@ -154,12 +148,6 @@ ok $*SCHEDULER ~~ Scheduler, "{$*SCHEDULER.^name} does Scheduler role"; "$name cannot combine :catch with :in and :at"; dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :at(now + 2), :in(1)), :catch({...}) }, "$name cannot combine :every/:catch with :in and :at"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10)) }, - "$name cannot combine :every and :times"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :at(now + 2)) }, - "$name cannot combine :every and :times with :at"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :in(1)) }, - "$name cannot combine :every and :times with :in"; - dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :catch({...})) }, - "$name cannot combine :every and :times with :catch"; + dies-ok { $*SCHEDULER.cue({ ... }, :every(0.1), :times(10), :stop({...})) }, + "$name cannot combine :every, :times and :stop"; } diff --git a/S17-scheduler/every.t b/S17-scheduler/every.t index 8be70ef1bc..531883889e 100644 --- a/S17-scheduler/every.t +++ b/S17-scheduler/every.t @@ -1,7 +1,7 @@ use v6; use Test; -plan 18; +plan 20; # real scheduling here my $name = $*SCHEDULER.^name; @@ -83,6 +83,16 @@ my $name = $*SCHEDULER.^name; LEAVE $c.cancel; } +{ + my $a = 0; + my $c = $*SCHEDULER.cue({ cas $a, {.succ} }, :every(0.1), :10times); + isa-ok $c, Cancellation; + sleep 3; + diag "seen $a runs" if ! + is $a, 10, "Cue with :every/:times schedules repeatedly for 10 times"; + LEAVE $c.cancel; +} + { my $a = 0; my $b = 0;