Merge ~paelzer/ubuntu/+source/chrony:bug-1836929-1836882-test-fails-disco into ubuntu/+source/chrony:ubuntu/disco-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Without fixes both tests fail:
- simulation due to clksim changes
- service checks due to (non critical) stderr output

Checking my fixes:
1. build time self tests not affected (to be expected but I wanted to be sure)
2. autpkgtest fixed
   111-knownclient .................... PASS
   112-port .................... PASS

Builds succeed in PPA [1] and I later have started a Bileto PPA [2] hoping I might do the LP infra testing via ticket [3] check on this to be sure.

[1]: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1836929-1836882-test-fails-disco
[2]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3759
[3]: https://bileto.ubuntu.com/#/ticket/3759

[Christian Ehrhardt  (paelzer)]

Tests complete and (with the fix) all green now:
https://bileto.ubuntu.com/excuses/3759/disco.html

[Rafael David Tinoco (rafaeldtinoco)]

+1. Reviewed and good!

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, tagged pushed and uploaded.

diff --git a/debian/changelog b/debian/changelog
index 2995a8c..83c4a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+chrony (3.4-1ubuntu1.1) disco; urgency=medium
+
+  * Fix recently degraded autopkgtests:
+    - d/t/control: allow stderr for recent changes in other packages causing a non
+      critical stderr output in the test (LP: #1836882)
+    - Backport fixes from 3.5-2 to clksim execution (Thanks to Vincent Blut)
+      (LP: #1836929)
+      + d/t/upstream-simulation-test-suite: Fix make call
+      + d/t/upstream-simulation-test-suite: Fix unability to launch run script
+      + d/t/upstream-simulation-test-suite: Use a known good clknetsim commit
+      + d/p/: Add update_processing_of_packet_log.patch for changed output
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 18 Jul 2019 07:42:03 +0200
+
 chrony (3.4-1ubuntu1) disco; urgency=medium
 
   * Merge with Debian unstable (LP: #1802886). Remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..b2982a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+update_processing_of_packet_log.patch
diff --git a/debian/patches/update_processing_of_packet_log.patch b/debian/patches/update_processing_of_packet_log.patch
new file mode 100644
index 0000000..812b2f2
--- /dev/null
+++ b/debian/patches/update_processing_of_packet_log.patch
@@ -0,0 +1,23 @@
+From 62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <[e-mail]>
+Date: Tue, 18 Jun 2019 15:41:50 +0200
+Subject: test: update processing of packet log
+
+Two new fields have been added to the packet log, which broke some
+of the simulation tests.
+
+Applied-Upstream: https://git.tuxfamily.org/chrony/chrony.git/commit/?id=62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a
+--- a/test/simulation/test.common
++++ b/test/simulation/test.common
+@@ -391,9 +391,9 @@ check_packet_port() {
+ 	for i in $(seq 1 $(get_chronyd_nodes)); do
+ 		test_message 3 0 "node $i:"
+ 
+-		grep -E -q "	$port	[0-9]+\$" tmp/log.packets && \
++		grep -E -q "^([0-9e.+-]+	){5}$port	" tmp/log.packets && \
+ 			! grep -E "^[0-9e.+-]+	$i	" tmp/log.packets | \
+-			grep -E -q -v "	$port	[0-9]+\$" && \
++			grep -E -q -v "^([0-9e.+-]+	){5}$port	" && \
+ 			test_ok || test_bad
+ 		[ $? -eq 0 ] || ret=1
+ 	done
diff --git a/debian/tests/control b/debian/tests/control
index fb124dc..18d31c5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -4,4 +4,4 @@ Restrictions: isolation-container, needs-root, allow-stderr, rw-build-tree, buil
 
 Tests: time-sources-from-dhcp-servers
 Depends: @, isc-dhcp-server, isc-dhcp-client, iproute2, kmod
-Restrictions: isolation-machine, needs-root
+Restrictions: isolation-machine, needs-root, allow-stderr
diff --git a/debian/tests/upstream-simulation-test-suite b/debian/tests/upstream-simulation-test-suite
index f2a5947..b9cfb4a 100644
--- a/debian/tests/upstream-simulation-test-suite
+++ b/debian/tests/upstream-simulation-test-suite
@@ -14,11 +14,12 @@ fi
 cd test/simulation
 
 if [ ! -d clknetsim ]; then
-    git clone https://github.com/mlichvar/clknetsim
+    git clone https://github.com/mlichvar/clknetsim && cd clknetsim && \
+        git checkout 156b8e4
 fi
 
-if [ ! -x "clknetsim/clknetsim" ] && [ ! -e "clknetsim/clknetsim.so" ]; then
-    make -C clknetsim
+if [ ! -x "clknetsim" ] && [ ! -e "clknetsim.so" ]; then
+    make
 fi
 
-./run -i 20 -m 2
+cd .. && ./run -i 20 -m 2