sequoia-openpgp: adjust tests to align with the package names

Since #1001251 caused the +crypto-nettle-dev package to be renamed
+nettle-dev, we should have adjusted the generated tests in the same
way.

Note that we are still working around #985762 -- the only difference
between debian/tests/control.debcargo.hint and debian/tests/control
should be removal of the "flaky" restriction for the --all-features
test (test-name=rust-sequoia-openpgp:@)

diff --git a/src/sequoia-openpgp/debian/changelog b/src/sequoia-openpgp/debian/changelog
index a9e89a4df8f873b2b2c68aa1013d058f83b6ce72..9474ae54fc654cb51660dcfbb9c5ea4f318eb651 100644 (file)
--- a/src/sequoia-openpgp/debian/changelog
+++ b/src/sequoia-openpgp/debian/changelog
@@ -1,3 +1,9 @@
+rust-sequoia-openpgp (1.7.0-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package sequoia-openpgp 1.7.0 from crates.io using debcargo 2.5.0
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 09 Feb 2022 01:31:35 -0500
+
 rust-sequoia-openpgp (1.7.0-2) unstable; urgency=medium
 
   * Package sequoia-openpgp 1.7.0 from crates.io using debcargo 2.5.0

diff --git a/src/sequoia-openpgp/debian/debcargo.toml b/src/sequoia-openpgp/debian/debcargo.toml
index 4c40ffc866ed518abbdf5e192acf7643c82b4dc7..aa6f1edc34843595782fbbbe0a09a14dc100fa0e 100644 (file)
--- a/src/sequoia-openpgp/debian/debcargo.toml
+++ b/src/sequoia-openpgp/debian/debcargo.toml
@@ -8,7 +8,7 @@ uploaders = ["Daniel Kahn Gillmor <dkg@fifthhorseman.net>"]
 # See https://bugs.debian.org/985741 for more info.
 [packages.lib]
 test_is_broken = true
-[packages."lib+crypto-nettle"]
+[packages."lib+nettle"]
 test_is_broken = false
 [packages."lib+default"]
 test_is_broken = false

diff --git a/src/sequoia-openpgp/debian/tests/control b/src/sequoia-openpgp/debian/tests/control
index 43af63380573eefedd76d1adc4509e8202eeccaa..d4b08ec1fb1f70a6d2bd6aea07d2993d73bdf1dd 100644 (file)
--- a/src/sequoia-openpgp/debian/tests/control
+++ b/src/sequoia-openpgp/debian/tests/control
@@ -28,16 +28,6 @@ Features: test-name=librust-sequoia-openpgp+compression-deflate-dev:compression-
 Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable, flaky
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets --no-default-features --features nettle
-Features: test-name=librust-sequoia-openpgp+crypto-nettle-dev:nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
-Restrictions: allow-stderr, skip-not-installable, flaky
-
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets --no-default-features --features crypto-nettle
-Features: test-name=librust-sequoia-openpgp+crypto-nettle-dev:crypto-nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
-Restrictions: allow-stderr, skip-not-installable
-
 Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets 
 Features: test-name=librust-sequoia-openpgp+default-dev:default
 Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
@@ -47,3 +37,13 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-t
 Features: test-name=librust-sequoia-openpgp+flate2-dev:flate2
 Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable, flaky
+
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets --no-default-features --features crypto-nettle
+Features: test-name=librust-sequoia-openpgp+nettle-dev:crypto-nettle
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Restrictions: allow-stderr, skip-not-installable
+
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets --no-default-features --features nettle
+Features: test-name=librust-sequoia-openpgp+nettle-dev:nettle
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Restrictions: allow-stderr, skip-not-installable

diff --git a/src/sequoia-openpgp/debian/tests/control.debcargo.hint b/src/sequoia-openpgp/debian/tests/control.debcargo.hint
index 8d00588350c1dca08cd668954a47735404fa7e3e..487d0df650c43a36527cb0bfbfdee06782486959 100644 (file)
--- a/src/sequoia-openpgp/debian/tests/control.debcargo.hint
+++ b/src/sequoia-openpgp/debian/tests/control.debcargo.hint
@@ -46,4 +46,4 @@ Restrictions: allow-stderr, skip-not-installable
 Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.7.0 --all-targets --no-default-features --features nettle
 Features: test-name=librust-sequoia-openpgp+nettle-dev:nettle
 Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
-Restrictions: allow-stderr, skip-not-installable, flaky
+Restrictions: allow-stderr, skip-not-installable