docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add gun to CryptoServiceTester 

The gun field is not necessary yet, but will be useful in a future
commit. But including it immediately allows us to simplify by using
an ordinary method for cryptoServiceFactory instead of closures.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2015-12-02 14:44:23 +01:00
parent 2bfadacf34
commit d3c3d70d6d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cryptoservice/crypto_service_test.go
View File

@ -23,9 +23,13 @@ var algoToSigType = map[string]data.SigAlgorithm{
var passphraseRetriever = func(string, string, bool, int) (string, bool, error) { return "", false, nil } var passphraseRetriever = func(string, string, bool, int) (string, bool, error) { return "", false, nil }
type CryptoServiceTester struct { type CryptoServiceTester struct {
cryptoServiceFactory func() *CryptoService role string
role string keyAlgo string
keyAlgo string gun string
}
func (c CryptoServiceTester) cryptoServiceFactory() *CryptoService {
return NewCryptoService(c.gun, trustmanager.NewKeyMemoryStore(passphraseRetriever))
} }
// asserts that created key exists // asserts that created key exists
@ -251,10 +255,6 @@ func (c CryptoServiceTester) errorMsg(message string, args ...interface{}) strin
} }
func testCryptoService(t *testing.T, gun string) { func testCryptoService(t *testing.T, gun string) {
getTestingCryptoService := func() *CryptoService {
return NewCryptoService(
gun, trustmanager.NewKeyMemoryStore(passphraseRetriever))
}
roles := []string{ roles := []string{
data.CanonicalRootRole, data.CanonicalRootRole,
data.CanonicalTargetsRole, data.CanonicalTargetsRole,
@ -265,9 +265,9 @@ func testCryptoService(t *testing.T, gun string) {
for _, role := range roles { for _, role := range roles {
for algo := range algoToSigType { for algo := range algoToSigType {
cst := CryptoServiceTester{ cst := CryptoServiceTester{
cryptoServiceFactory: getTestingCryptoService, role: role,
role: role, keyAlgo: algo,
keyAlgo: algo, gun: gun,
} }
cst.TestCreateAndGetKey(t) cst.TestCreateAndGetKey(t)
cst.TestCreateAndGetWhenMultipleKeystores(t) cst.TestCreateAndGetWhenMultipleKeystores(t)