From 6647b92c86b2dd5dc5c6af457c400b3ee55c7c39 Mon Sep 17 00:00:00 2001 From: Yang Li Date: Sun, 27 May 2018 16:19:11 +0800 Subject: [PATCH] apiserver: update tests to use sub-benchmarks (secretbox_test.go) --- .../value/encrypt/secretbox/secretbox_test.go | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go index 1dd42bd4da3..b19ccc3061f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox_test.go @@ -77,12 +77,39 @@ func TestSecretboxKeyRotation(t *testing.T) { } } -func BenchmarkSecretboxRead_32_1024(b *testing.B) { benchmarkSecretboxRead(b, 32, 1024, false) } -func BenchmarkSecretboxRead_32_16384(b *testing.B) { benchmarkSecretboxRead(b, 32, 16384, false) } -func BenchmarkSecretboxRead_32_16384_Stale(b *testing.B) { benchmarkSecretboxRead(b, 32, 16384, true) } +func BenchmarkSecretboxRead(b *testing.B) { + tests := []struct { + keyLength int + valueLength int + expectStale bool + }{ + {keyLength: 32, valueLength: 1024, expectStale: false}, + {keyLength: 32, valueLength: 16384, expectStale: false}, + {keyLength: 32, valueLength: 16384, expectStale: true}, + } + for _, t := range tests { + name := fmt.Sprintf("%vKeyLength/%vValueLength/%vExpectStale", t.keyLength, t.valueLength, t.expectStale) + b.Run(name, func(b *testing.B) { + benchmarkSecretboxRead(b, t.keyLength, t.valueLength, t.expectStale) + }) + } +} -func BenchmarkSecretboxWrite_32_1024(b *testing.B) { benchmarkSecretboxWrite(b, 32, 1024) } -func BenchmarkSecretboxWrite_32_16384(b *testing.B) { benchmarkSecretboxWrite(b, 32, 16384) } +func BenchmarkSecretboxWrite(b *testing.B) { + tests := []struct { + keyLength int + valueLength int + }{ + {keyLength: 32, valueLength: 1024}, + {keyLength: 32, valueLength: 16384}, + } + for _, t := range tests { + name := fmt.Sprintf("%vKeyLength/%vValueLength", t.keyLength, t.valueLength) + b.Run(name, func(b *testing.B) { + benchmarkSecretboxWrite(b, t.keyLength, t.valueLength) + }) + } +} func benchmarkSecretboxRead(b *testing.B, keyLength int, valueLength int, expectStale bool) { p := value.NewPrefixTransformers(nil,