[Git][clojure-team/core-async-clojure][debian/main] 3 commits: Add standard headers to Lein Local patch

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / core-async-clojure


Commits:
63fa25b5 by Jérôme Charaoui at 2022-07-05T17:45:57-04:00
Add standard headers to Lein Local patch

Gbp-Dch: ignore

- - - - -
9cbf1ca9 by Jérôme Charaoui at 2022-07-05T17:57:56-04:00
Skip test assertions which hang in single-cpu env

Replaces previous patch which didn't work on autobuilders, tests still
failed systematically.

Closes: #1013662

- - - - -
8885c6af by Jérôme Charaoui at 2022-07-05T17:58:48-04:00
Update d/changelog for release

- - - - -


5 changed files:

- debian/changelog
- debian/patches/0001_Lein_Local.patch
- + debian/patches/0002-Skip-test-assertions-which-hang-in-single-cpu-env.patch
- − debian/patches/0002_Fix_Test_Timing.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+core-async-clojure (1.3.610-6) unstable; urgency=medium
+
+  * Team upload.
+  * Skip test assertions which hang in single-cpu env (Closes: #1013662)
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Tue, 05 Jul 2022 17:27:51 -0400
+
 core-async-clojure (1.3.610-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -1,8 +1,16 @@
-Patch project.clj so we can build using lein locally.
-Index: core-async-clojure/project.clj
-===================================================================
---- core-async-clojure.orig/project.clj
-+++ core-async-clojure/project.clj
+From: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
+Date: Tue, 5 Jul 2022 17:19:22 -0400
+Subject: Patch project.clj so we can build using lein locally
+
+Forwarded: not-needed
+---
+ project.clj | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/project.clj b/project.clj
+index a8f5bd0..3b9bbd4 100644
+--- a/project.clj
++++ b/project.clj
 @@ -1,12 +1,10 @@
 -(defproject org.clojure/core.async "0.1.0-SNAPSHOT"
 +(defproject org.clojure/core.async "1.3.610"


=====================================
debian/patches/0002-Skip-test-assertions-which-hang-in-single-cpu-env.patch
=====================================
@@ -0,0 +1,41 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Tue, 5 Jul 2022 17:56:14 -0400
+Subject: Skip test assertions which hang in single-cpu env
+
+This part hangs indefinitely (possible deadlock) when running on a
+signle-cpu system, or as a part of a single-cpu bound cgroup.
+
+Forwarded: no
+---
+ src/test/clojure/clojure/core/async_test.clj | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
+
+diff --git a/src/test/clojure/clojure/core/async_test.clj b/src/test/clojure/clojure/core/async_test.clj
+index b6028d3..57a2780 100644
+--- a/src/test/clojure/clojure/core/async_test.clj
++++ b/src/test/clojure/clojure/core/async_test.clj
+@@ -288,23 +288,7 @@
+       (is (= [0 1 2 3]
+              (<!! (a/into [] a))))
+       (is (= [0 1 2 3]
+-             (<!! (a/into [] b)))))
+-
+-    ;; ASYNC-127
+-    (let [ch (to-chan! [1 2 3])
+-          m (mult ch)
+-          t-1 (chan)
+-          t-2 (chan)
+-          t-3 (chan)]
+-      (tap m t-1)
+-      (tap m t-2)
+-      (tap m t-3)
+-      (close! t-3)
+-      (is (= 1 (<!! t-1)))
+-      (is (= nil (a/poll! t-1))) ;; t-2 hasn't taken yet
+-      (is (= 1 (<!! t-2)))
+-      (is (= 2 (<!! t-1))) ;; now available
+-      (is (= nil (a/poll! t-1)))))
++             (<!! (a/into [] b))))))
+ 
+   (testing "mix"
+     (let [out (chan)


=====================================
debian/patches/0002_Fix_Test_Timing.patch deleted
=====================================
@@ -1,42 +0,0 @@
-Revert upstream commit 094d239e0261263de3799bb6bd1cc33f06833d8b "make test less
-timing dependent", as it seems to intermittently create the following
-regression:
-
-  lein test :only clojure.core.async-test/ops-tests
-
-  FAIL in (ops-tests) (async_test.clj:304)
-  mult
-  expected: (= nil (a/poll! t-1))
-    actual: (not (= nil 2))
-
-  lein test :only clojure.core.async-test/ops-tests
-
-  FAIL in (ops-tests) (async_test.clj:305)
-  mult
-  expected: (= 1 (<!! t-2))
-    actual: (not (= 1 2))
-
-  lein test :only clojure.core.async-test/ops-tests
-
-  FAIL in (ops-tests) (async_test.clj:306)
-  mult
-  expected: (= 2 (<!! t-1))
-    actual: (not (= 2 3))
-Index: core-async-clojure/src/test/clojure/clojure/core/async_test.clj
-===================================================================
---- core-async-clojure.orig/src/test/clojure/clojure/core/async_test.clj
-+++ core-async-clojure/src/test/clojure/clojure/core/async_test.clj
-@@ -300,10 +300,10 @@
-       (tap m t-2)
-       (tap m t-3)
-       (close! t-3)
--      (is (= 1 (<!! t-1)))
-+      (is (= 1 (a/poll! t-1)))
-       (is (= nil (a/poll! t-1))) ;; t-2 hasn't taken yet
--      (is (= 1 (<!! t-2)))
--      (is (= 2 (<!! t-1))) ;; now available
-+      (is (= 1 (a/poll! t-2)))
-+      (is (= 2 (a/poll! t-1))) ;; now available
-       (is (= nil (a/poll! t-1)))))
- 
-   (testing "mix"


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
 0001_Lein_Local.patch
-0002_Fix_Test_Timing.patch
+0002-Skip-test-assertions-which-hang-in-single-cpu-env.patch



View it on GitLab: https://salsa.debian.org/clojure-team/core-async-clojure/-/compare/a387d3743339f1e69475a8999876d44e3d666a40...8885c6afe4dabce2f23eaa5197a8dad24a966509

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/core-async-clojure/-/compare/a387d3743339f1e69475a8999876d44e3d666a40...8885c6afe4dabce2f23eaa5197a8dad24a966509
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220705/42cfca22/attachment.htm>