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

[Cyril Brulebois]

Cyril Brulebois pushed to branch master at Debian Java Maintainers / trapperkeeper-status-clojure


Commits:
31a9bf95 by Cyril Brulebois at 2018-12-30T22:04:47Z
Fix FTBFS by running tests in a specific order (Closes: #880351).

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.

- - - - -
6b398b13 by Cyril Brulebois at 2018-12-30T22:05:58Z
Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).

- - - - -
2dc43fcc by Cyril Brulebois at 2019-02-07T11:41:05Z
releasing version 0.7.1-2

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+trapperkeeper-status-clojure (0.7.1-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: #880351). 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:40:59 +0100
+
 trapperkeeper-status-clojure (0.7.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #855744)


=====================================
debian/control
=====================================
@@ -32,8 +32,8 @@ Build-Depends:
  libtext-markdown-perl | markdown,
  default-jdk
 Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/trapperkeeper-status-clojure.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/trapperkeeper-status-clojure.git
+Vcs-Git: https://salsa.debian.org/java-team/trapperkeeper-status-clojure.git
+Vcs-Browser: https://salsa.debian.org/java-team/trapperkeeper-status-clojure
 Homepage: https://github.com/puppetlabs/trapperkeeper-status
 
 Package: libtrapperkeeper-status-clojure


=====================================
debian/rules
=====================================
@@ -40,6 +40,18 @@ override_jh_clean:
 	markdown $< >> $@
 	cat debian/footer.html >> $@
 
+# Tests can't run in a random order (#880351):
+override_dh_auto_test: ORDERED_TESTS=puppetlabs/trapperkeeper/services/status/check_test.clj puppetlabs/trapperkeeper/services/status/status_core_test.clj puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj puppetlabs/trapperkeeper/services/status/status_service_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:
-	(cd test && find . -name "*.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))



View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-status-clojure/compare/3af2062f5f4f077ec2575cafbfbed88fd73c48b0...2dc43fccc95bac2e0fd5010d20f810cb6afb4441

-- 
View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-status-clojure/compare/3af2062f5f4f077ec2575cafbfbed88fd73c48b0...2dc43fccc95bac2e0fd5010d20f810cb6afb4441
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/e8668a39/attachment.html>