Merge ~ahasenack/ubuntu/+source/curl:mantic-curl-slapd-dep8-test into ubuntu/+source/curl:ubuntu/devel

[Andreas Hasenack]

ppc64el and s390x were failing constantly in the infrastructure[1], but not in real machines (I tried ppc64el). On a hunch, I thought it could be because slapd is restarted and right afterwards the test begins, and there might not be enough time for slapd to be ready, so I added this counter.

The DEP8 tests take a long time. I have a PPA run with a slightly older version than this MP, but the changes should be insignificant (s/stdout/stderr/ in the fprintf I added, and I moved counter++ up to before that print).

The tests pass now, and the log shows at least one retry was needed:

  3962s ldapi:// connection failed, retrying (count=0)

ppa: https://launchpad.net/~ahasenack/+archive/ubuntu/plusoneweek/+packages

1. https://autopkgtest.ubuntu.com/results/autopkgtest-mantic/mantic/ppc64el/c/curl/20230806_154319_0bb08@/log.gz

[Andreas Hasenack (ahasenack)]

I used fprintf instead of ldap_perror() because of the format string I wanted to add (count=%d) ;)

[Bryce Harrington (bryce)]

Looks good, the addition of the retry logic with sleep(1) makes sense. The cleanup() logic for printing out extra debug info is a good practice that I bet would be good to spread to other dep8 tests.

Anyway, LGTM, +1.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks! Uploaded with rich history:

Uploading curl_8.2.1-1ubuntu2.dsc
Uploading curl_8.2.1-1ubuntu2.debian.tar.xz
Uploading curl_8.2.1-1ubuntu2_source.buildinfo
Uploading curl_8.2.1-1ubuntu2_source.changes

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 365b14c..51fa734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+curl (8.2.1-1ubuntu2) mantic; urgency=medium
+
+  * d/t/control, d/t/curl-ldapi-test: move test-command to an actual
+    test script and add a retry logic (LP: #2030911)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 09 Aug 2023 17:10:40 -0300
+
 curl (8.2.1-1ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/tests/LDAP-bindata.c b/debian/tests/LDAP-bindata.c
index 2e6469c..69ec53c 100644
--- a/debian/tests/LDAP-bindata.c
+++ b/debian/tests/LDAP-bindata.c
@@ -117,12 +117,18 @@ int main(void) {
 		ldap_perror(p, "Failed to initialize libldap");
 		exit(EXIT_FAILURE);
 	}
-	if(p = ldap_connect(ldp)) {
-		ldap_perror(p, "Failed to connect to slapd over UNIX domain socket");
-		if(p = ldap_unbind_ext(ldp, NULL, NULL)) {
-			ldap_perror(p, "Failed to deinitialize libldap");
+	unsigned int counter = 0;
+	while (p = ldap_connect(ldp)) {
+		counter++;
+		fprintf(stderr, "ldapi:// connection failed, retrying (count=%d)\n", counter);
+		if (counter >= 10) {
+			ldap_perror(p, "Failed to connect to slapd over UNIX domain socket");
+			if (p = ldap_unbind_ext(ldp, NULL, NULL)) {
+				ldap_perror(p, "Failed to deinitialize libldap");
+			}
+			exit(EXIT_FAILURE);
 		}
-		exit(EXIT_FAILURE);
+		sleep(1);
 	}
 	if(p = ldap_sasl_bind_s(ldp, u8"CN=admin,DC=example,DC=com", LDAP_SASL_SIMPLE, &(struct berval){.bv_len = strlen(u8"Password"), .bv_val = u8"Password"}, NULL, NULL, NULL)) {
 		ldap_perror(p, "Failed to bind to directory server");
diff --git a/debian/tests/control b/debian/tests/control
index de9e1b9..c4974e1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -10,6 +10,6 @@ Tests: upstream-tests-nss
 Depends: @builddeps@
 Restrictions: allow-stderr
 
-Test-Command: gcc debian/tests/LDAP-bindata.c $(pkgconf --cflags --libs ldap libcurl) -o "$AUTOPKGTEST_TMP"/ldap-test && "$AUTOPKGTEST_TMP"/ldap-test
+Tests: curl-ldapi-test
 Depends: gcc, libc-dev, libcurl4-openssl-dev | libcurl-dev, libldap-dev, slapd, pkgconf
 Restrictions: allow-stderr, isolation-container, needs-root
diff --git a/debian/tests/curl-ldapi-test b/debian/tests/curl-ldapi-test
new file mode 100644
index 0000000..4455431
--- /dev/null
+++ b/debian/tests/curl-ldapi-test
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+cleanup() {
+    if [ $? -ne 0 ]; then
+        set +e
+        echo "## Something failed, gathering logs"
+        echo
+        echo "## syslog"
+        tail -n 50 /var/log/syslog
+        echo
+        echo "## slapd journal"
+        journalctl -u slapd
+    fi
+}
+
+trap cleanup EXIT
+
+echo "## Building ldap-test app"
+gcc debian/tests/LDAP-bindata.c $(pkgconf --cflags --libs ldap libcurl) -o "$AUTOPKGTEST_TMP"/ldap-test
+
+echo "## calling ldap-test"
+"$AUTOPKGTEST_TMP"/ldap-test