Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-213: Message Builder

Browse Source
This commit is contained in:
James Houlahan
2021-03-17 10:33:03 +01:00
parent 8db89a1a6c
commit 50550d42b4
42 changed files with 3041 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/versioner/version_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/sum"
tests "github.com/ProtonMail/proton-bridge/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -68,7 +69,7 @@ func TestVerifyWithBadFile(t *testing.T) {
filepath.Join("sub", "f5.tgz"),
)
badKeyRing := makeKeyRing(t)
badKeyRing := tests.MakeKeyRing(t)
signFile(t, filepath.Join(tempDir, "f3.bad"), badKeyRing)
assert.Error(t, version.VerifyFiles(kr))
@ -91,14 +92,14 @@ func TestVerifyWithBadSubFile(t *testing.T) {
filepath.Join("sub", "f5.bad"),
)
badKeyRing := makeKeyRing(t)
badKeyRing := tests.MakeKeyRing(t)
signFile(t, filepath.Join(tempDir, "sub", "f5.bad"), badKeyRing)
assert.Error(t, version.VerifyFiles(kr))
}
func createSignedFiles(t *testing.T, root string, paths ...string) *crypto.KeyRing {
kr := makeKeyRing(t)
kr := tests.MakeKeyRing(t)
for _, path := range paths {
makeFile(t, filepath.Join(root, path))
@ -118,16 +119,6 @@ func createSignedFiles(t *testing.T, root string, paths ...string) *crypto.KeyRi
return kr
}
func makeKeyRing(t *testing.T) *crypto.KeyRing {
key, err := crypto.GenerateKey("name", "email", "rsa", 2048)
require.NoError(t, err)
kr, err := crypto.NewKeyRing(key)
require.NoError(t, err)
return kr
}
func makeFile(t *testing.T, path string) {
require.NoError(t, os.MkdirAll(filepath.Dir(path), 0700))