Skip to content

Commit a9ca6cf

Browse files
committed
Fix dropped errors in manifold.go-off
Timeout tests are changed so that every timeout exception has a uniquely identifiable message which makes it easier to match up the dropped error warning with the originating timeout.
1 parent 890f96a commit a9ca6cf

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/manifold/go_off.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
(defn ^:no-doc run-state-machine-wrapped [state]
4747
(try (async-runtime/run-state-machine state)
4848
(catch Throwable ex
49-
(d/error! (async-runtime/aget-object state async-runtime/USER-START-IDX) ex)
50-
(throw ex))))
49+
(d/error! (async-runtime/aget-object state async-runtime/USER-START-IDX) ex))))
5150

5251
(defn ^:no-doc take! [state blk d]
5352
(let [handler (fn [x]

test/manifold/go_off_test.clj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@
115115
(testing "timeouts"
116116
(is (= ::timeout @(go-off (<!? (d/timeout! (d/deferred) 10 ::timeout)))))
117117
(is (= ::timeout @(d/timeout! (go-off (<!? (d/deferred))) 10 ::timeout)))
118-
(is (thrown? TimeoutException @(go-off (<!? (d/timeout! (d/deferred) 10)))))
119-
(is (thrown? TimeoutException @(d/timeout! (go-off (<!? (d/deferred))) 10))))
118+
(is (thrown? TimeoutException @(go-off (<!? (d/timeout! (d/deferred) 11)))))
119+
(is (thrown? TimeoutException @(d/timeout! (go-off (<!? (d/deferred))) 12))))
120120

121121
(testing "alt"
122-
(is (= ::timeout @(go-off (<!? (d/alt (d/deferred) (d/timeout! (d/deferred) 10 ::timeout))))))
123-
(is (= ::timeout @(d/alt (go-off (<!? (d/deferred))) (d/timeout! (d/deferred) 10 ::timeout))))
122+
(is (= ::timeout @(go-off (<!? (d/alt (d/deferred) (d/timeout! (d/deferred) 13 ::timeout))))))
123+
(is (= ::timeout @(d/alt (go-off (<!? (d/deferred))) (d/timeout! (d/deferred) 14 ::timeout))))
124124
(is (= 1 @(go-off (<!? (d/alt (d/deferred) (d/success-deferred 1))))))
125125
(is (= 1 @(d/alt (go-off (<!? (d/deferred))) (d/success-deferred 1))))))
126126

0 commit comments

Comments
 (0)