From f3cf7b471807b9ed7fc9b3b3caddc334adf49fe3 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <smirnov.andrey@gmail.com>
Date: Wed, 10 Jul 2019 22:15:12 +0300
Subject: [PATCH] Try Travis on xenial workers

---
 .travis.yml       | 2 +-
 pgp/gnupg_test.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2207f20af..6506824e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 sudo: required
 
 language: go
diff --git a/pgp/gnupg_test.go b/pgp/gnupg_test.go
index 9ee8dfa40..03fd410a1 100644
--- a/pgp/gnupg_test.go
+++ b/pgp/gnupg_test.go
@@ -172,10 +172,10 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) {
 			continue
 		}
 
-		args := []string{"--import", "--no-default-keyring"}
+		args := []string{"--import", "--no-default-keyring", "--batch"}
 
 		if item.suffix == "_passprhase" {
-			args = append(args, "--passphrase", "verysecret", "--no-tty", "--batch")
+			args = append(args, "--passphrase", "verysecret", "--no-tty")
 			if ver == GPG21xPlus {
 				args = append(args, "--pinentry-mode", "loopback")
 			}
@@ -190,7 +190,7 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) {
 	// import public keys into gpg2
 	// we can't use pre-built keyrings as gpg 2.0.x and 2.1+ have different keyring formats
 	for _, suffix := range []string{"", "_passphrase"} {
-		output, err := exec.Command(gpg, "--no-default-keyring", "--keyring", "./keyrings/aptly2"+suffix+".gpg",
+		output, err := exec.Command(gpg, "--no-default-keyring", "--batch", "--keyring", "./keyrings/aptly2"+suffix+".gpg",
 			"--import", "keyrings/aptly2"+suffix+".pub.armor").CombinedOutput()
 		c.Log(string(output))
 		c.Check(err, IsNil)