Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix broken test #13

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Fix broken test #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestPoolTimeout(t *testing.T) {
for _, d := range []time.Duration{0, time.Second} {
t.Run(fmt.Sprintf("first login, exp %v", d), func(t *testing.T) {
prevIdleTimeout := instance.cfg.IdleTimeout
defer func() {instance.cfg.IdleTimeout = prevIdleTimeout}()
defer func() { instance.cfg.IdleTimeout = prevIdleTimeout }()
instance.cfg.IdleTimeout = d

configureWithPin(t)
Expand All @@ -55,7 +55,7 @@ func TestPoolTimeout(t *testing.T) {

t.Run(fmt.Sprintf("reuse expired handle, exp %v", d), func(t *testing.T) {
prevIdleTimeout := instance.cfg.IdleTimeout
defer func() {instance.cfg.IdleTimeout = prevIdleTimeout}()
defer func() { instance.cfg.IdleTimeout = prevIdleTimeout }()
instance.cfg.IdleTimeout = d

configureWithPin(t)
Expand All @@ -68,7 +68,9 @@ func TestPoolTimeout(t *testing.T) {

time.Sleep(instance.cfg.IdleTimeout + time.Second)

_, err = key.Sign(rand.Reader, crypto.SHA256.New().Sum([]byte("sha256")), crypto.SHA256)
digest := crypto.SHA256.New()
digest.Write([]byte("sha256"))
_, err = key.Sign(rand.Reader, digest.Sum(nil), crypto.SHA256)
if err != nil {
if perr, ok := err.(pkcs11.Error); !ok || perr != pkcs11.CKR_OBJECT_HANDLE_INVALID {
t.Fatal("failed to reuse existing key handle, unexpected error:", err)
Expand All @@ -77,4 +79,3 @@ func TestPoolTimeout(t *testing.T) {
})
}
}