[Git][java-team/ssl-utils-clojure][master] 3 commits: Fix FTBFS by running tests in a specific order (Closes: #880320).

[Cyril Brulebois]

Cyril Brulebois pushed to branch master at Debian Java Maintainers / ssl-utils-clojure


Commits:
7a8cdf43 by Cyril Brulebois at 2018-12-30T22:08:43Z
Fix FTBFS by running tests in a specific order (Closes: #880320).

Instead of blindly sorting the results of the find command and trusting
it to be right, encode a suitable sequence of tests. Also make sure to
error out when tests are added or removed, to make sure this sequence
get refreshed when needed.

- - - - -
2eb56d16 by Cyril Brulebois at 2018-12-30T22:09:35Z
Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).

- - - - -
b978952c by Cyril Brulebois at 2019-02-07T11:39:04Z
releasing version 0.8.3-2

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+ssl-utils-clojure (0.8.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS by running tests in a specific order. Instead of blindly
+    sorting the results of the find command and trusting it to be right,
+    encode a suitable sequence of tests (Closes: #880320). Also make sure
+    to error out when tests are added or removed, to make sure this
+    sequence get refreshed when needed.
+  * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+
+ -- Cyril Brulebois <kibi at debian.org>  Thu, 07 Feb 2019 12:38:40 +0100
+
 ssl-utils-clojure (0.8.3-1) unstable; urgency=medium
 
   * Initial release (Closes: #855740)


=====================================
debian/control
=====================================
@@ -17,8 +17,8 @@ Build-Depends: clojure (>= 1.8),
                markdown,
                maven-repo-helper (>= 1.5~)
 Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/ssl-utils-clojure.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/ssl-utils-clojure.git
+Vcs-Git: https://salsa.debian.org/java-team/ssl-utils-clojure.git
+Vcs-Browser: https://salsa.debian.org/java-team/ssl-utils-clojure
 Homepage: https://github.com/puppetlabs/jvm-ssl-utils
 
 Package: libssl-utils-clojure


=====================================
debian/rules
=====================================
@@ -24,10 +24,21 @@ override_jh_clean:
 	rm -f $(CURDIR)/$(PRODUCED_JAR)
 	rm -rf $(CURDIR)/doc/html
 
+# Tests can't run in a random order (#880320):
+override_dh_auto_test: ORDERED_TESTS=puppetlabs/ssl_utils/core_test.clj puppetlabs/ssl_utils/extensions_utils_test.clj puppetlabs/ssl_utils/simple_test.clj
+override_dh_auto_test: EXPECTED=$(shell echo "$(ORDERED_TESTS)" | sed 's/ /\n/g' | sort | xargs)
+override_dh_auto_test: FOUND=$(shell cd test && find -name '*.clj' | sed 's,^[.]/,,' | sort | xargs)
 override_dh_auto_test:
-	dh_auto_test
-	(cd test && find . -name "*_test.clj" | \
-		xargs --verbose clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH))
+	# Make sure to detect when tests appear or disappear:
+	@if [ "$(FOUND)" != "$(EXPECTED)" ]; then \
+		echo "E: sanity check failed, available tests don't match known tests:"; \
+		echo "    - found:    $(FOUND)"; \
+		echo "    - expected: $(EXPECTED)"; \
+		echo "=> Please update ORDERED_TESTS in debian/rules accordingly"; \
+		exit 1; \
+	fi
+	# Run tests:
+	(cd test && clojure -cp $(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH) $(ORDERED_TESTS))
 
 get-orig-source:
 	uscan --download-version $(DEB_VERSION_UPSTREAM) --force-download --rename



View it on GitLab: https://salsa.debian.org/java-team/ssl-utils-clojure/compare/dc1117c03a39931bb26017d115c8bb80d80913b5...b978952ce7dce60d2d83b28c98c43f698c4f25b2

-- 
View it on GitLab: https://salsa.debian.org/java-team/ssl-utils-clojure/compare/dc1117c03a39931bb26017d115c8bb80d80913b5...b978952ce7dce60d2d83b28c98c43f698c4f25b2
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/20190207/9d3d1b60/attachment.html>