Test createBlock and check all os.RemoveAll in the tests for errors. (#549)
Testing that createBlock creates blocks that can be opened. and checking the os.RemoveAll for errors will catch errors for un-closed files under windows. Many missing .Close() calls were added for fixing failing os.RemoveAll Signed-off-by: Krasi Georgiev <kgeorgie@redhat.com>pull/5805/head
Krasi Georgiev
6 years ago
committed by
GitHub
parent
dd0d3c6f02
commit
c3ffdf1a99
@ -0,0 +1,62 @@ |
||||
// Copyright 2016 The etcd Authors
|
||||
//
|
||||
// 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 errors |
||||
|
||||
import ( |
||||
"bytes" |
||||
"fmt" |
||||
) |
||||
|
||||
// The MultiError type implements the error interface, and contains the
|
||||
// Errors used to construct it.
|
||||
type MultiError []error |
||||
|
||||
// Returns a concatenated string of the contained errors
|
||||
func (es MultiError) Error() string { |
||||
var buf bytes.Buffer |
||||
|
||||
if len(es) > 1 { |
||||
fmt.Fprintf(&buf, "%d errors: ", len(es)) |
||||
} |
||||
|
||||
for i, err := range es { |
||||
if i != 0 { |
||||
buf.WriteString("; ") |
||||
} |
||||
buf.WriteString(err.Error()) |
||||
} |
||||
|
||||
return buf.String() |
||||
} |
||||
|
||||
// Add adds the error to the error list if it is not nil.
|
||||
func (es *MultiError) Add(err error) { |
||||
if err == nil { |
||||
return |
||||
} |
||||
if merr, ok := err.(MultiError); ok { |
||||
*es = append(*es, merr...) |
||||
} else { |
||||
*es = append(*es, err) |
||||
} |
||||
} |
||||
|
||||
// Err returns the error list as an error or nil if it is empty.
|
||||
func (es MultiError) Err() error { |
||||
if len(es) == 0 { |
||||
return nil |
||||
} |
||||
return es |
||||
} |
||||
Loading…
Reference in new issue