@@ -40,8 +40,24 @@ main :: IO ()
40main = hspec $ do
40main = hspec $ do
41 parallelTests
41 parallelTests
43+ describe "restricts concurrency and cleans up extra tasks" $ do
44+ it "take 1 asyncly" $ checkCleanup 2 asyncly (S.take 1)
45+ it "take 1 wAsyncly" $ checkCleanup 2 wAsyncly (S.take 1)
46+ it "take 1 aheadly" $ checkCleanup 2 aheadly (S.take 1)
48+ it "takeWhile (< 0) asyncly" $ checkCleanup 2 asyncly (S.takeWhile (< 0))
49+ it "takeWhile (< 0) wAsyncly" $ checkCleanup 2 wAsyncly (S.takeWhile (< 0))
50+ it "takeWhile (< 0) aheadly" $ checkCleanup 2 aheadly (S.takeWhile (< 0))
53+ let timed :: (IsStream t, Monad (t IO)) => Int -> t IO Int
54+ timed x = S.yieldM (threadDelay (x * 100000)) >> return x
43 -- These are not run parallely because the timing gets affected
56 -- These are not run parallely because the timing gets affected
44 -- unpredictably when other tests are running on the same machine.
57 -- unpredictably when other tests are running on the same machine.
59+ -- Also, they fail intermittently due to scheduling delays, so not run on
45 describe "Nested parallel and serial compositions" $ do
61 describe "Nested parallel and serial compositions" $ do
46 let t = timed
62 let t = timed
47 p = wAsyncly
63 p = wAsyncly
@@ -83,16 +99,6 @@ main = hspec $ do
83 <> ((t 4 <> t 8) <> (t 0 <> t 2)))
99 <> ((t 4 <> t 8) <> (t 0 <> t 2)))
84 `shouldReturn` ([0,0,2,2,4,4,8,8])
100 `shouldReturn` ([0,0,2,2,4,4,8,8])
86− describe "restricts concurrency and cleans up extra tasks" $ do
87− it "take 1 asyncly" $ checkCleanup 2 asyncly (S.take 1)
88− it "take 1 wAsyncly" $ checkCleanup 2 wAsyncly (S.take 1)
89− it "take 1 aheadly" $ checkCleanup 2 aheadly (S.take 1)
91− it "takeWhile (< 0) asyncly" $ checkCleanup 2 asyncly (S.takeWhile (< 0))
92− it "takeWhile (< 0) wAsyncly" $ checkCleanup 2 wAsyncly (S.takeWhile (< 0))
93− it "takeWhile (< 0) aheadly" $ checkCleanup 2 aheadly (S.takeWhile (< 0))
96 -- parallely fails on CI machines, may need more difference in times of
102 -- parallely fails on CI machines, may need more difference in times of
97 -- the events, but that would make tests even slower.
103 -- the events, but that would make tests even slower.
98 it "take 1 parallely" $ checkCleanup 3 parallely (S.take 1)
104 it "take 1 parallely" $ checkCleanup 3 parallely (S.take 1)
@@ -789,9 +795,6 @@ nestTwoParallelApp =
789 in ((S.toList . parallely) ((+) <$> s1 <*> s2) >>= return . sort)
795 in ((S.toList . parallely) ((+) <$> s1 <*> s2) >>= return . sort)
790 `shouldReturn` sort ([6,7,7,8,8,8,9,9,9,9,10,10,10,11,11,12] :: [Int])
796 `shouldReturn` sort ([6,7,7,8,8,8,9,9,9,9,10,10,10,11,11,12] :: [Int])
792−timed :: (IsStream t, Monad (t IO)) => Int -> t IO Int
793−timed x = S.yieldM (threadDelay (x * 100000)) >> return x
795interleaveCheck :: IsStream t
798interleaveCheck :: IsStream t
796 => (t IO Int -> SerialT IO Int)
799 => (t IO Int -> SerialT IO Int)
797 -> (t IO Int -> t IO Int -> t IO Int)
800 -> (t IO Int -> t IO Int -> t IO Int)