Try Travis on xenial workers

aptly-dev · Jul 10, 2019 · f3cf7b4 · f3cf7b4
1 parent 3b8c067
commit f3cf7b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)