diff options
| author | Joseph Richey <joerichey@google.com> | 2017-07-18 10:59:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 10:59:40 -0700 |
| commit | 8867856db45abaed8b9e2539ee7c34d99360db56 (patch) | |
| tree | 5895bce36a9dff465057d84819b0d65255e1c702 /actions | |
| parent | 3d08d9f6891db3ca94337e9b987ef62cba535fe1 (diff) | |
| parent | 17f7dd867d0fd450377c6862c0782483d39ae408 (diff) | |
Merge pull request #22 from google/fix
Fixing fscrypt build system
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/hashing_test.go | 2 | ||||
| -rw-r--r-- | actions/policy.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actions/hashing_test.go b/actions/hashing_test.go index e3cffb6..d249d8b 100644 --- a/actions/hashing_test.go +++ b/actions/hashing_test.go @@ -30,8 +30,8 @@ import ( // estimations are somewhat close to the targets. func TestCostsSearch(t *testing.T) { for _, target := range []time.Duration{ - 20 * time.Millisecond, 100 * time.Millisecond, + 200 * time.Millisecond, 500 * time.Millisecond, } { costs, err := getHashingCosts(target) diff --git a/actions/policy.go b/actions/policy.go index 1291e6b..946bdd4 100644 --- a/actions/policy.go +++ b/actions/policy.go @@ -61,7 +61,6 @@ func PurgeAllPolicies(ctx *Context) error { switch errors.Cause(err) { case nil, crypto.ErrKeyringSearch: // We don't care if the key has already been removed - break default: return err } |