Make vos tests use -noresolve

Pull in upstream patch to get more reproducible output in the tests,
to hopefully ("this time for sure") fix the armhf buildd.

Also use our normal formatting for the (over-eager) Closes tag in the previous
version, including the octothorpe.

Change-Id: I0be253ecb83f01e35963b837329829228935911e

diff --git a/debian/changelog b/debian/changelog
index ff38827e0b74847d529448fdda58b68f05f473a3..079d333343be50efca0266eda1fb46c8d9c1478f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.8.6~pre1-2) UNRELEASED; urgency=medium
+
+  * Pull in upstream patch to not resolve IP addresses to names in the
+    vos tests (Closes: #953729)
+
+ -- Benjamin Kaduk <kaduk@mit.edu>  Sat, 21 Mar 2020 18:42:25 -0700
+
 openafs (1.8.6~pre1-1) unstable; urgency=medium
 
   * New upstream prerelease (Closes: #953709):
@@ -12,7 +19,7 @@ openafs (1.8.6~pre1-1) unstable; urgency=medium
   * Pull in additional patches from upstream:
     - Support linux kernel 5.6 release
     - Recognize ppc64le in configure's OS-detection logic
-    - Skip vos tests if vlserver port is already bound (Closes: 953729)
+    - Skip vos tests if vlserver port is already bound (Closes: #953729)
   * Fix typo preventing ppc64el support from working (Closes: #946520)
   * Update Italian debconf translation; thanks Beatrice Torracca
     (Closes: #952799)

diff --git a/debian/patches/0006-tests-do-not-resolve-addresses-in-vos-vl-test.patch b/debian/patches/0006-tests-do-not-resolve-addresses-in-vos-vl-test.patch
new file mode 100644 (file)
index 0000000..b646f5f
--- /dev/null
+++ b/debian/patches/0006-tests-do-not-resolve-addresses-in-vos-vl-test.patch
@@ -0,0 +1,44 @@
+From: Michael Meffie <mmeffie@sinenomine.net>
+Date: Fri, 10 Jan 2020 09:06:38 -0500
+Subject: tests: do not resolve addresses in vos/vl test
+
+The vos-t test adds a set of 10.* test addresses to a test vlserver and
+runs vos to read them back.  When the test is run in an environment
+where hosts have been assigned in the 10.* internal network, vos will resolve
+the addresses to hostnames and the test fails.  Pass the -noresolve
+option to vos for this test when checking for the expected list of
+addresses.
+
+Example test output before this commit:
+
+    ./vos-t
+    ...
+    #   seen: 10.0.0.0
+    10.0.0.1
+    myhost.example.com
+    10.0.0.3
+    ...
+    not ok 5 - vos output matches
+
+Change-Id: Ief43fe180a0dfff211f28d5f47be6224270907a3
+Reviewed-on: https://gerrit.openafs.org/14020
+Tested-by: BuildBot <buildbot@rampaginggeek.com>
+Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
+(cherry picked from commit dcf44ab5fc5c1f5e2e759ea4b6156f7e1faa4b7a)
+---
+ tests/volser/vos-t.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/volser/vos-t.c b/tests/volser/vos-t.c
+index 1ec75a1..e80a195 100644
+--- a/tests/volser/vos-t.c
++++ b/tests/volser/vos-t.c
+@@ -78,7 +78,7 @@ TestListAddrs(struct ubik_client *client, char *dirname)
+           exit(1);
+       }
+       execl(binPath, "vos",
+-            "listaddrs", "-config", dirname, "-noauth", NULL);
++            "listaddrs", "-config", dirname, "-noauth", "-noresolve", NULL);
+       exit(1);
+     }
+     close(outpipe[1]);

diff --git a/debian/patches/series b/debian/patches/series
index 6a928764f2e9f1c10386196d5d5eecbf6b074f03..a6cf9f17a65cac8acd18cfa8ac3250750e5234c1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-LINUX-Avoid-building-rand-fortuna-kernel.o.patch
 0004-LINUX-5.6-define-time_t-and-use-timespec-timespec64.patch
 0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch
+0006-tests-do-not-resolve-addresses-in-vos-vl-test.patch