a/certmagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Matthew Holt 2024-06-03 21:55:10 -06:00
parent a1e1bd6ab5
commit 88e840d8b9
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_test.go
View File

@ -25,6 +25,8 @@ import (
"sync" "sync"
"testing" "testing"
"time" "time"
"go.uber.org/zap"
) )
// memoryStorage is an in-memory storage implementation with known contents *and* fixed iteration order for List. // memoryStorage is an in-memory storage implementation with known contents *and* fixed iteration order for List.
@ -153,7 +155,7 @@ func (r *recordingStorage) record(name string, args ...interface{}) {
var _ Storage = (*recordingStorage)(nil) var _ Storage = (*recordingStorage)(nil)
func TestNewAccount(t *testing.T) { func TestNewAccount(t *testing.T) {
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata_tmp"}, Storage: &FileStorage{Path: "./_testdata_tmp"},
@ -181,7 +183,7 @@ func TestNewAccount(t *testing.T) {
func TestSaveAccount(t *testing.T) { func TestSaveAccount(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata1_tmp"}, Storage: &FileStorage{Path: "./_testdata1_tmp"},
@ -217,7 +219,7 @@ func TestSaveAccount(t *testing.T) {
func TestGetAccountDoesNotAlreadyExist(t *testing.T) { func TestGetAccountDoesNotAlreadyExist(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata_tmp"}, Storage: &FileStorage{Path: "./_testdata_tmp"},
@ -239,7 +241,7 @@ func TestGetAccountDoesNotAlreadyExist(t *testing.T) {
func TestGetAccountAlreadyExists(t *testing.T) { func TestGetAccountAlreadyExists(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata2_tmp"}, Storage: &FileStorage{Path: "./_testdata2_tmp"},
@ -288,7 +290,7 @@ func TestGetAccountAlreadyExists(t *testing.T) {
func TestGetAccountAlreadyExistsSkipsBroken(t *testing.T) { func TestGetAccountAlreadyExistsSkipsBroken(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &memoryStorage{}, Storage: &memoryStorage{},
@ -337,7 +339,7 @@ func TestGetAccountAlreadyExistsSkipsBroken(t *testing.T) {
func TestGetAccountWithEmailAlreadyExists(t *testing.T) { func TestGetAccountWithEmailAlreadyExists(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &recordingStorage{Storage: &memoryStorage{}}, Storage: &recordingStorage{Storage: &memoryStorage{}},
@ -404,7 +406,7 @@ func TestGetEmailFromPackageDefault(t *testing.T) {
discoveredEmail = "" discoveredEmail = ""
}() }()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata2_tmp"}, Storage: &FileStorage{Path: "./_testdata2_tmp"},
@ -426,7 +428,7 @@ func TestGetEmailFromPackageDefault(t *testing.T) {
func TestGetEmailFromUserInput(t *testing.T) { func TestGetEmailFromUserInput(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata3_tmp"}, Storage: &FileStorage{Path: "./_testdata3_tmp"},
@ -461,7 +463,7 @@ func TestGetEmailFromUserInput(t *testing.T) {
func TestGetEmailFromRecent(t *testing.T) { func TestGetEmailFromRecent(t *testing.T) {
ctx := context.Background() ctx := context.Background()
am := &ACMEIssuer{CA: dummyCA, mu: new(sync.Mutex)} am := &ACMEIssuer{CA: dummyCA, Logger: zap.NewNop(), mu: new(sync.Mutex)}
testConfig := &Config{ testConfig := &Config{
Issuers: []Issuer{am}, Issuers: []Issuer{am},
Storage: &FileStorage{Path: "./_testdata4_tmp"}, Storage: &FileStorage{Path: "./_testdata4_tmp"},