vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-26 13:47:40 +00:00
Code Issues Projects Releases Wiki Activity

move away from assert package

Browse Source 
we don't actually use it anywhere else
This commit is contained in:
Harald Sitter
2018-04-25 15:35:01 +02:00
parent cd6075ba94
commit f89e322ece
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgp/gnupg_test.go
+18 -13
View File
@@ -5,7 +5,6 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/stretchr/testify/assert"
. "gopkg.in/check.v1" . "gopkg.in/check.v1"
) )
@@ -28,8 +27,9 @@ func (s *GnupgSuite) TestGPG1(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
signer := GpgSigner{} signer := GpgSigner{}
assert.NoError(c, signer.Init()) err := signer.Init()
assert.Equal(c, "gpg", signer.gpg) c.Assert(err, IsNil)
c.Assert(signer.gpg, Equals, "gpg")
} }
// gpg(2) + gpg1 installed = pick gpg1 // gpg(2) + gpg1 installed = pick gpg1
@@ -39,8 +39,9 @@ func (s *GnupgSuite) TestGPG1Not2(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
signer := GpgSigner{} signer := GpgSigner{}
assert.NoError(c, signer.Init()) err := signer.Init()
assert.Equal(c, "gpg1", signer.gpg) c.Assert(err, IsNil)
c.Assert(signer.gpg, Equals, "gpg1")
} }
// If gpg == gpg2 and no gpg1 is available = error // If gpg == gpg2 and no gpg1 is available = error
@@ -50,8 +51,9 @@ func (s *GnupgSuite) TestGPGNothing(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
signer := GpgSigner{} signer := GpgSigner{}
assert.Error(c, signer.Init()) err := signer.Init()
assert.Equal(c, "", signer.gpg) c.Assert(err, NotNil)
c.Assert(signer.gpg, Equals, "")
} }
// If gpgv == gpgv1 = pick gpgv // If gpgv == gpgv1 = pick gpgv
@@ -61,8 +63,9 @@ func (s *GnupgSuite) TestGPGV1(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
verifier := GpgVerifier{} verifier := GpgVerifier{}
assert.NoError(c, verifier.InitKeyring()) err := verifier.InitKeyring()
assert.Equal(c, "gpgv", verifier.gpgv) c.Assert(err, IsNil)
c.Assert(verifier.gpgv, Equals, "gpgv")
} }
// gpgv(2) + gpgv1 installed = pick gpgv1 // gpgv(2) + gpgv1 installed = pick gpgv1
@@ -72,8 +75,9 @@ func (s *GnupgSuite) TestGPGV1Not2(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
verifier := GpgVerifier{} verifier := GpgVerifier{}
assert.NoError(c, verifier.InitKeyring()) err := verifier.InitKeyring()
assert.Equal(c, "gpgv1", verifier.gpgv) c.Assert(err, IsNil)
c.Assert(verifier.gpgv, Equals, "gpgv1")
} }
// If gpgv == gpgv2 and no gpgv1 is available = error // If gpgv == gpgv2 and no gpgv1 is available = error
@@ -83,6 +87,7 @@ func (s *GnupgSuite) TestGPGVNothing(c *C) {
defer func() { os.Setenv("PATH", origPath) }() defer func() { os.Setenv("PATH", origPath) }()
verifier := GpgVerifier{} verifier := GpgVerifier{}
assert.Error(c, verifier.InitKeyring()) err := verifier.InitKeyring()
assert.Equal(c, "", verifier.gpgv) c.Assert(err, NotNil)
c.Assert(verifier.gpgv, Equals, "")
} }