Run regression tests against the Python 3 version of Twisted Conch

4 files changed, 4 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 432b40358..a6f1662d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:8.0p1-4) UNRELEASED; urgency=medium
     - Remove #! lines.
     - Avoid star imports.
     - Fix flake8 errors.
+  * Run regression tests against the Python 3 version of Twisted Conch.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 03 Aug 2019 12:49:17 +0100
 
diff --git a/debian/control b/debian/control
index b09575308..c690df075 100644
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,7 @@ Depends: openssh-client (= ${binary:Version}),
          openssh-sftp-server (= ${binary:Version}),
          openssl,
          putty-tools (>= 0.67-2),
-         python-twisted-conch (>= 1:15.5.0-1),
+         python3-twisted,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: OpenSSH regression tests
diff --git a/debian/run-tests b/debian/run-tests
index 7c7a8b2a3..2b787ef60 100755
--- a/debian/run-tests
+++ b/debian/run-tests
@@ -25,7 +25,7 @@ make -C "$tmp/regress" \
 	TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
 	TEST_SSH_PLINK=plink \
 	TEST_SSH_PUTTYGEN=puttygen \
-	TEST_SSH_CONCH=conch \
+	TEST_SSH_CONCH=conch3 \
 	TEST_SSH_IPV6=yes \
 	TEST_SSH_ECC=yes \
 	tests interop-tests </dev/zero || ret="$?"
diff --git a/debian/tests/control b/debian/tests/control
index b010ac63c..8bc480a74 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -5,6 +5,6 @@ Depends: devscripts,
          openssh-tests,
          openssl,
          putty-tools,
-         python-twisted-conch,
+         python3-twisted,
          sudo,
          sysvinit-utils,