[Git][pkg-voip-team/asterisk][master] 2 commits: Fix autopkgtest by parsing XML results

[Bernhard Schmidt]

Bernhard Schmidt pushed to branch master at Debian VoIP Packaging Team / asterisk


Commits:
ae20a341 by Bernhard Schmidt at 2019-01-03T14:33:28Z
Fix autopkgtest by parsing XML results

In 13.23 (also present in 16.1) some upstream change broke creation
of the txt-formatted testsuite results. Asterisk segfaults in this
case. The output of the xml-formatted results (used by upstream CI)
works.

Switch to generating xml results and actually parsing the xml using
xmllint for errors.

See #909689

- - - - -
65ed7a5c by Bernhard Schmidt at 2019-01-03T15:21:39Z
Changelog for 1:13.23.1~dfsg-2

- - - - -


3 changed files:

- debian/changelog
- debian/tests/asttestmods
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+asterisk (1:13.23.1~dfsg-2) unstable; urgency=medium
+
+  * Fix autopkgtest by parsing XML results (Closes: #909689)
+
+ -- Bernhard Schmidt <berni at debian.org>  Thu, 03 Jan 2019 16:20:10 +0100
+
 asterisk (1:13.23.1~dfsg-1) unstable; urgency=medium
 
   * New upstream version 13.23.1~dfsg


=====================================
debian/tests/asttestmods
=====================================
@@ -40,7 +40,7 @@ EOF
 
 run() {
 	$asterisk -rx 'test execute all' 2>&1
-	$asterisk -rx "test generate results txt $results_file"
+	$asterisk -rx "test generate results xml $results_file"
 	$asterisk -rx 'module show like test_' | awk '/Running/ {print $1}' \
 		| sort  > "$output_dir/mods_loaded"
 	ls /usr/lib/asterisk/modules/ | sort | grep ^test_ > "$output_dir/mods_all"
@@ -49,12 +49,11 @@ run() {
 		diff "$output_dir/mods_loaded" "$output_dir/mods_all"
 		echo "Manually disabled: $disable_mods"
 	fi
-	header=`cat "$results_file" | sed -e '/^$/,$d' `
-	failed=`echo "$header" | awk '/^Failed/ {print $3}'`
+	failed=`xmllint --xpath 'string(//testsuite/@errors)' $results_file`
 	test_in_source=`grep AST_TEST_REGISTER tests/test_*.c | wc -l`
 	if [ "$failed" != '0' ]; then
 		echo >&2 "Some tests failed:"
-		echo >&2 "$header"
+		echo >&2 "$results_file"
 		$asterisk -rx "test show results failed" >&2
 	fi
 }


=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
 Tests: asttestmods
 Restrictions: needs-root, isolation-container
-Depends: asterisk, asterisk-voicemail, asterisk-tests, asterisk-core-sounds-en-gsm
+Depends: asterisk, asterisk-voicemail, asterisk-tests, asterisk-core-sounds-en-gsm, libxml2-utils



View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/compare/31ad5a41a0083d8b2bd65b9b74319bca50353b8f...65ed7a5c59c1567a634a96b75186c3a4f29bf268

-- 
View it on GitLab: https://salsa.debian.org/pkg-voip-team/asterisk/compare/31ad5a41a0083d8b2bd65b9b74319bca50353b8f...65ed7a5c59c1567a634a96b75186c3a4f29bf268
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-voip-maintainers/attachments/20190103/8129b47c/attachment-0001.html>