Merge ~vpa1977/ubuntu/+source/cryptsetup:lp1983522-cryptroot-lvm into ubuntu/+source/cryptsetup:ubuntu/devel

[Vladimir Petko]

This merge proposal enables cryptsetup-lvm test for cryptsetup package.
The test did wait indefinitely for select() to return when trying to flush the console.

  * Fix cryptroot-lvm autopkgtest on Ubuntu. (LP: #1983522)
    - debian/tests/control: enable cryptroot-lvm
    - debian/tests/utils/mock.pm: return from consume() function if select()
      times out or fails

Please tag and sponsor

PPA: ppa:vpa1977/cryptsetup-review-comments

Steps to test:

The test should be passing in CI now:

https://autopkgtest.ubuntu.com/request.cgi/?release=lunar&arch=amd64&package=cryptsetup&ppa=vpa1977%2Fcryptsetup-review-comments&trigger=cryptsetup%2F2%3A2.5.0-6ubuntu3~ppa1

Unmerged commits

3005ffc... by Vladimir Petko on 2022-12-04

enable cryptroot lvm

7e6e6ff... by Vladimir Petko on 2022-12-04

stop consuming if select() times out or fails

8f80106... by Vladimir Petko on 2022-12-04

stop consuming if select() times out or fails

fa9ef6c... by Vladimir Petko on 2022-12-02

2:2.5.0-6ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

7054325... by Steve Langasek on 2022-11-07

2:2.5.0-6ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 946f04c..9660ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cryptsetup (2:2.5.0-6ubuntu3~ppa1) lunar; urgency=medium
+
+  * Fix cryptroot-lvm autopkgtest on Ubuntu. (LP: #1983522)
+    - debian/tests/control: enable cryptroot-lvm
+    - debian/tests/utils/mock.pm: return from consume() function if select()
+      times out or fails
+
+ -- Vladimir Petko <[e-mail]>  Fri, 02 Dec 2022 15:53:42 +1300
+
 cryptsetup (2:2.5.0-6ubuntu2) lunar; urgency=medium
 
   * Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522)
diff --git a/debian/tests/control b/debian/tests/control
index 729d905..0b7e9be 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -56,9 +56,7 @@ Tests: initramfs-hook
 Depends: cryptsetup-initramfs, e2fsprogs, zstd
 Restrictions: allow-stderr, needs-root, isolation-machine
 
-# cryptroot-lvm test is disabled - it hangs in CI
-#Tests: cryptroot-lvm, cryptroot-legacy
-Tests: cryptroot-legacy
+Tests: cryptroot-lvm, cryptroot-legacy
 # Only dependencies required to set the VM here are listed here;
 # cryptsetup is not listed since we only install it in the VM.
 Depends: cryptsetup-bin,
diff --git a/debian/tests/utils/mock.pm b/debian/tests/utils/mock.pm
index d412d12..2425d87 100644
--- a/debian/tests/utils/mock.pm
+++ b/debian/tests/utils/mock.pm
@@ -106,8 +106,8 @@ sub consume($) {
 
     while(unpack("b*", $RBITS) != 0) {
         my $rout = $RBITS;
-        while (select($rout, undef, undef, undef) == -1) {
-            die "select: $!" unless $! == EINTR; # try again immediately if select(2) was interrupted
+        if (select($rout, undef, undef, 1) == -1) {
+            return;
         }
         read_data($rout);
         if (length($$buffer) == 0) {