[Git][clojure-team/puppetlabs-http-client-clojure][debian/main] 3 commits: d/tests: move metrics tests in separate flaky instance
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Thu May 8 17:51:38 BST 2025
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-http-client-clojure
Commits:
b482afca by Jérôme Charaoui at 2025-05-08T12:22:42-04:00
d/tests: move metrics tests in separate flaky instance
Closes: #1104291
- - - - -
f7f8dcc7 by Jérôme Charaoui at 2025-05-08T12:22:44-04:00
d/patches: remove flaky unittest
Closes: #1104377
- - - - -
3928937f by Jérôme Charaoui at 2025-05-08T12:23:06-04:00
Update changelog for 2.1.1-2 release
- - - - -
7 changed files:
- debian/changelog
- + debian/patches/0003-Drop-flaky-unit-tests.patch
- debian/patches/series
- + debian/tests/common.sh
- debian/tests/control
- debian/tests/unittests
- + debian/tests/unittests-metrics
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+puppetlabs-http-client-clojure (2.1.1-2) unstable; urgency=medium
+
+ * d/patches: remove flaky unittest (Closes: #1104377)
+ * d/tests: move metrics tests in separate flaky instance (Closes: #1104291)
+
+ -- Jérôme Charaoui <jerome at riseup.net> Thu, 08 May 2025 12:22:54 -0400
+
puppetlabs-http-client-clojure (2.1.1-1) unstable; urgency=medium
* New upstream version 2.1.1
=====================================
debian/patches/0003-Drop-flaky-unit-tests.patch
=====================================
@@ -0,0 +1,36 @@
+From: Jérôme Charaoui <jerome at riseup.net>
+Date: Thu, 8 May 2025 09:31:49 -0400
+Subject: Drop flaky unit tests
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/1104377
+
+---
+ test/puppetlabs/http/client/metrics_test.clj | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/puppetlabs/http/client/metrics_test.clj b/test/puppetlabs/http/client/metrics_test.clj
+index d040227..99f44fe 100644
+--- a/test/puppetlabs/http/client/metrics_test.clj
++++ b/test/puppetlabs/http/client/metrics_test.clj
+@@ -335,10 +335,6 @@
+ (is (<= 5 (.getMean short-data-post)))
+ (is (<= 5 (.getAggregate short-data-post)))
+
+- (is (>= 1 (Math/abs (- (.getAggregate short-data)
+- (+ (.getAggregate short-data-get)
+- (.getAggregate short-data-post))))))
+-
+ (is (= long-name (.getMetricName long-data)))
+ (is (= 1 (.getCount long-data)))
+ (is (<= 100 (.getMean long-data)))
+@@ -421,10 +417,6 @@
+ (is (<= 5 (:mean short-data-post)))
+ (is (<= 5 (:aggregate short-data-post)))
+
+- (is (>= 1 (Math/abs (- (:aggregate short-data)
+- (+ (:aggregate short-data-get)
+- (:aggregate short-data-post))))))
+-
+ (is (= long-name (:metric-name long-data)))
+ (is (= 1 (:count long-data)))
+ (is (<= 100 (:mean long-data)))
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
0001_Lein_Local.patch
0002-Avoid-exit-code-1-when-running-gen-pki.sh-during-tes.patch
+0003-Drop-flaky-unit-tests.patch
=====================================
debian/tests/common.sh
=====================================
@@ -0,0 +1,20 @@
+CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/httpasyncclient.jar:/usr/share/java/schema.jar:/usr/share/java/commons-io.jar:/usr/share/java/metrics-core.jar:/usr/share/java/ssl-utils.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/jul-to-slf4j.jar:/usr/share/java/cheshire.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:/usr/share/java/trapperkeeper-webserver-jetty9-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore-nio.jar:/usr/share/java/puppetlabs-http-client.jar:test
+
+cp -a dev-resources test "$AUTOPKGTEST_TMP"
+cd "$AUTOPKGTEST_TMP" || exit 1
+
+# needed by puppetlabs.trapperkeeper.testutils.bootstrap
+mkdir target
+
+# generate test certificates
+./dev-resources/gen-pki.sh 2>/dev/null
+
+if [ $(dpkg-architecture -qDEB_HOST_ARCH_BITS) -lt 64 ] ; then
+ HEAPSIZE=1590M
+else
+ HEAPSIZE=8192M
+fi
+
+# fix for "java.lang.OutOfMemoryError: Java heap space" error
+# during test: java-existing-streaming-with-large-payload-without-decompression
+export _JAVA_OPTIONS="-Xms128M -Xmx${HEAPSIZE}"
=====================================
debian/tests/control
=====================================
@@ -14,3 +14,16 @@ Depends: @,
libbcpkix-java,
openssl
Restrictions: allow-stderr
+
+Tests: unittests-metrics
+Depends: @,
+ clojure,
+ libbultitude-clojure,
+ libcheshire-clojure,
+ libkitchensink-clojure (>= 3.1.1-2),
+ libtrapperkeeper-clojure (>= 3.1.0),
+ libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
+ libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
+ libbcpkix-java,
+ openssl
+Restrictions: allow-stderr, flaky
=====================================
debian/tests/unittests
=====================================
@@ -1,31 +1,13 @@
#!/bin/sh
-set -efu
-
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/httpasyncclient.jar:/usr/share/java/schema.jar:/usr/share/java/commons-io.jar:/usr/share/java/metrics-core.jar:/usr/share/java/ssl-utils.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/jul-to-slf4j.jar:/usr/share/java/cheshire.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:/usr/share/java/trapperkeeper-webserver-jetty9-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore-nio.jar:/usr/share/java/puppetlabs-http-client.jar:test
-
-cp -a dev-resources test "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP"
-# needed by puppetlabs.trapperkeeper.testutils.bootstrap
-mkdir target
-
-# generate test certificates
-./dev-resources/gen-pki.sh 2>/dev/null
-
-if [ $(dpkg-architecture -qDEB_HOST_ARCH_BITS) -lt 64 ] ; then
- HEAPSIZE=1590M
-else
- HEAPSIZE=8192M
-fi
+set -efu
-# fix for "java.lang.OutOfMemoryError: Java heap space" error
-# during test: java-existing-streaming-with-large-payload-without-decompression
-export _JAVA_OPTIONS="-Xms128M -Xmx${HEAPSIZE}"
+. "$(dirname $0)/common.sh"
clojure \
- -cp $CLASSPATH \
+ -cp "$CLASSPATH" \
-e "(require '[clojure.test])" \
-e "(require '[bultitude.core :as b])" \
-e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
-e "(map #(require %) all-tests)" \
- -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"(?:com\.)?puppetlabs\.http\.client\.\S+-test")) 0 1))'
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"(?:com\.)?puppetlabs\.http\.client\.(?!(metrics|sync-plaintext))\S*-test")) 0 1))'
=====================================
debian/tests/unittests-metrics
=====================================
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -efu
+
+. "$(dirname $0)/common.sh"
+
+clojure \
+ -cp "$CLASSPATH" \
+ -e "(require '[clojure.test])" \
+ -e "(require '[bultitude.core :as b])" \
+ -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
+ -e "(map #(require %) all-tests)" \
+ -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"(?:com\.)?puppetlabs\.http\.client\.(metrics|sync-plaintext)\S*-test")) 0 1))'
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/c8d1662e83953a619711c09ac33a67441f8fde53...3928937f4cae8636dcb7a44c61844cadcde5e02d
--
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/c8d1662e83953a619711c09ac33a67441f8fde53...3928937f4cae8636dcb7a44c61844cadcde5e02d
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/20250508/d5846dd1/attachment.htm>
More information about the pkg-java-commits
mailing list