Merge ~liushuyu-011/ubuntu/+source/davmail:ubuntu/devel into ubuntu/+source/davmail:ubuntu/devel

[Zixing Liu]

This fixes the autopkgtest failure where nc printed out a "connection successful" message to stderr and failing the test.

[Graham Inggs (ginggs)]

The usual way to do this is to add:

Restrictions: allow-stderr

to debian/tests/control.

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

> The usual way to do this is to add:
>
> Restrictions: allow-stderr
>
> to debian/tests/control.

However, the script relies on stderr to fail the test when nc fails to connect to the test server.

Is that still warrant an `allow-stderr`?

[Graham Inggs (ginggs)]

OK, I see what you mean.

I'm not convinced we want to carry this as a delta in Ubuntu, but I'll leave my review neutral in case another sponsor disagrees.

Do we know why this regressed in Ubuntu and not in Debian? I think it's worth forwarding this fix there, to make their test more robust in case they are also affected in future.

review: Abstain

[Zixing Liu (liushuyu-011)]

I think the reason might be Ubuntu and Debian are using different nc implementations

[Michael Hudson-Doyle (mwhudson)]

What about this? Either way we should probably see if Debian will take a patch, it seems an unfortunate reason to introduce a delta.

diff --git a/debian/tests/binary-starts b/debian/tests/binary-starts
index 5aabca3..e469b7e 100644
--- a/debian/tests/binary-starts
+++ b/debian/tests/binary-starts
@@ -8,5 +8,5 @@ davmail-server /tmp/davmail.properties &

 pid=$!
 sleep 10
-nc -z localhost 1025 || echo "Daemon does not seem to listen" >&2
+nc.traditional -z localhost 1025 || echo "Daemon does not seem to listen" >&2
 kill $pid
diff --git a/debian/tests/control b/debian/tests/control
index a546e70..b352ebc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: binary-starts
-Depends: davmail-server, netcat
+Depends: davmail-server, netcat-traditional

[Graham Inggs (ginggs)]

I filed https://bugs.debian.org/1043143 about this.

I think it should be policy for autopkgtests not to depend on virtual packages (similar to how real packages must be listed before virtual alternatives in Build-Depends).

I'll try to get this policy accepted in Debian.

[Vladimir Petko (vpa1977)]

The bug is fixed in Debian and openjdk-* migrated =)
Probably the MP can be closed.

[Athos Ribeiro (athos-ribeiro)]

I am taking the sponsors slot here to clear up the sponsoring queue at http://reports.qa.ubuntu.com/reports/sponsoring/general.html since this seems to be fixed now. Unfortunately, I cannot properly set the status of this MP.

[Athos Ribeiro (athos-ribeiro)]

review: Abstain

Unmerged commits

51ab18c... by Zixing Liu on 2023-08-01

d/tests/binary-starts: redirect nc's success message to stdout

diff --git a/debian/tests/binary-starts b/debian/tests/binary-starts
index 5aabca3..65f6770 100644
--- a/debian/tests/binary-starts
+++ b/debian/tests/binary-starts
@@ -8,5 +8,5 @@ davmail-server /tmp/davmail.properties &
 
 pid=$!
 sleep 10
-nc -z localhost 1025 || echo "Daemon does not seem to listen" >&2
+nc -z localhost 1025 2>&1 || echo "Daemon does not seem to listen" >&2
 kill $pid