From 93415b198a3ef427c02893b8fdf036aa75ffe50f Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Wed, 21 Jun 2017 10:03:44 -0700 Subject: actions: error handling and API changed This commit changes the error handling for the actions package to use the error handling library github.com/pkg/errors. This means replacing "errors" with "github.com/pkg/errors", reworking some of the error values, and wrapping some errors with additional context. This commit also changes the Protector/Policy API, moving most of the package functionality into Protector or Policy methods. These types are now "locked" when they are queried from the filesystem, and Unlock() must be used to get their corresponding keys. Note that only certain operations will require unlocking the keys. Certain unnecessary functions and methods are also removed. This CL also fixes two bugs reported by Tyler Hicks in CreateConfigFile. CPU time is used instead of wall time, and kiB is used instead of kB. Change-Id: I88f45659e9fe4938d148843e3289e7b6d5b698d8 --- actions/hashing_test.go | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 actions/hashing_test.go (limited to 'actions/hashing_test.go') diff --git a/actions/hashing_test.go b/actions/hashing_test.go new file mode 100644 index 0000000..e3cffb6 --- /dev/null +++ b/actions/hashing_test.go @@ -0,0 +1,76 @@ +/* + * hashing_test.go - tests for computing and benchmarking hashing costs + * + * Copyright 2017 Google Inc. + * Author: Joe Richey (joerichey@google.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package actions + +import ( + "io/ioutil" + "log" + "testing" + "time" +) + +// Tests that we can find valid hashing costs for various time targets and the +// estimations are somewhat close to the targets. +func TestCostsSearch(t *testing.T) { + for _, target := range []time.Duration{ + 20 * time.Millisecond, + 100 * time.Millisecond, + 500 * time.Millisecond, + } { + costs, err := getHashingCosts(target) + if err != nil { + t.Error(err) + } + actual, err := timeHashingCosts(costs) + if err != nil { + t.Error(err) + } + + if actual*2 < target { + t.Errorf("actual=%v is too small (target=%v)", actual, target) + } + if target*2 < actual { + t.Errorf("actual=%v is too big (target=%v)", actual, target) + } + } +} + +func benchmarkCostsSearch(b *testing.B, target time.Duration) { + // Disable logging for benchmarks + log.SetOutput(ioutil.Discard) + for i := 0; i < b.N; i++ { + _, err := getHashingCosts(target) + if err != nil { + b.Fatal(err) + } + } +} + +func BenchmarkCostsSearch10ms(b *testing.B) { + benchmarkCostsSearch(b, 10*time.Millisecond) +} + +func BenchmarkCostsSearch100ms(b *testing.B) { + benchmarkCostsSearch(b, 100*time.Millisecond) +} + +func BenchmarkCostsSearch1s(b *testing.B) { + benchmarkCostsSearch(b, time.Second) +} -- cgit v1.2.3