[Pkg-privacy-commits] [Git][pkg-privacy-team/monkeysphere][debian/master] 2 commits: Autopkgtest should cover Ed25519 as well

[Daniel Kahn Gillmor]

Daniel Kahn Gillmor pushed to branch debian/master at Privacy Maintainers / monkeysphere


Commits:
2a55855b by Daniel Kahn Gillmor at 2019-01-24T22:04:22Z
Autopkgtest should cover Ed25519 as well

- - - - -
a2abfdf6 by Daniel Kahn Gillmor at 2019-01-24T22:05:34Z
cherry-pick three upstream testing patches

- - - - -


5 changed files:

- + debian/patches/0001-Expose-sshd-logs-when-ssh-test-fails.patch
- + debian/patches/0002-Ensure-that-make-test-ed25519-works-when-no-tty-is-p.patch
- + debian/patches/0003-Dump-remaining-jobs-during-test-cleanup.patch
- + debian/patches/series
- debian/tests/control


Changes:

=====================================
debian/patches/0001-Expose-sshd-logs-when-ssh-test-fails.patch
=====================================
@@ -0,0 +1,21 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 24 Jan 2019 15:33:32 -0500
+Subject: Expose sshd logs when ssh test fails
+
+(cherry picked from commit 27a86a05d74ca8f03e574d9776c2f0efd370ed17)
+---
+ tests/basic | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/basic b/tests/basic
+index 8815d69..5bf1149 100755
+--- a/tests/basic
++++ b/tests/basic
+@@ -87,6 +87,7 @@ ssh_test() {
+ 	return 0
+     else
+ 	echo "##### ssh connection test FAILED. returned: $RETURN, expected: $CODE"
++        cat "$TEMPDIR/sshd.log"
+ 	return 1
+     fi
+ }


=====================================
debian/patches/0002-Ensure-that-make-test-ed25519-works-when-no-tty-is-p.patch
=====================================
@@ -0,0 +1,22 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 24 Jan 2019 16:57:26 -0500
+Subject: Ensure that "make test-ed25519" works when no tty is present
+
+(cherry picked from commit a8f4ac40bdf8d3a5331ca9b10e2c49a7af7d0e66)
+---
+ tests/basic | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/basic b/tests/basic
+index 5bf1149..d5c4692 100755
+--- a/tests/basic
++++ b/tests/basic
+@@ -344,7 +344,7 @@ if [ "$MONKEYSPHERE_TEST_USE_ED25519" = true ]; then
+     echo "### generating ed25519 key for testuser..."
+     # from the imported secret key
+     USER_FPR=8A4B353B4CBA6F30625498BAE00B5EEEBA79B482
+-    gpg --quick-add-key "$USER_FPR" ed25519 auth 2d
++    gpg --batch --no-tty --quick-add-key "$USER_FPR" ed25519 auth 2d
+ else
+     echo "### generating standard monkeysphere key for testuser..."
+     monkeysphere gen-subkey


=====================================
debian/patches/0003-Dump-remaining-jobs-during-test-cleanup.patch
=====================================
@@ -0,0 +1,23 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Thu, 24 Jan 2019 15:53:55 -0500
+Subject: Dump remaining jobs during test cleanup
+
+See https://bugs.debian.org/920038 for more information about why this
+additional debugging information might be useful.
+
+(cherry picked from commit 318134aaa04befb6c1cf99b1b5ed21ec16ed33ff)
+---
+ tests/common | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/common b/tests/common
+index 727ad0f..0fc6c19 100644
+--- a/tests/common
++++ b/tests/common
+@@ -33,5 +33,6 @@ cleanup() {
+ 	kill "$SSHD_PID"
+     fi
+ 
++    jobs
+     wait
+ }


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,3 @@
+0001-Expose-sshd-logs-when-ssh-test-fails.patch
+0002-Ensure-that-make-test-ed25519-works-when-no-tty-is-p.patch
+0003-Dump-remaining-jobs-during-test-cleanup.patch


=====================================
debian/tests/control
=====================================
@@ -4,3 +4,6 @@ Restrictions: allow-stderr
 
 Test-Command: MONKEYSPHERE_TEST_USE_SYSTEM=true MONKEYSPHERE_TEST_NO_EXAMINE=true tests/basic
 Depends: @, openssh-server, openssl, socat, cpio
+
+Test-Command: MONKEYSPHERE_TEST_USE_SYSTEM=true MONKEYSPHERE_TEST_NO_EXAMINE=true MONKEYSPHERE_TEST_USE_ED25519=true tests/basic
+Depends: @, openssh-server, openssl, socat, cpio



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/compare/1db1eeb89fd974065873a65e4fa4ec43509fc7d7...a2abfdf63be3a55af736005130ac79cf09999b85

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/compare/1db1eeb89fd974065873a65e4fa4ec43509fc7d7...a2abfdf63be3a55af736005130ac79cf09999b85
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20190124/97d73b61/attachment-0001.html>