Added a ToClose field.
parent
0b43e99333
commit
abeaf77890
|
@ -16,6 +16,7 @@ package samples
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -47,6 +48,10 @@ type SampleTest struct {
|
||||||
// The directory at which the file system is mounted.
|
// The directory at which the file system is mounted.
|
||||||
Dir string
|
Dir string
|
||||||
|
|
||||||
|
// Anothing non-nil in this slice will be closed by TearDown. The test will
|
||||||
|
// fail if closing fails.
|
||||||
|
ToClose []io.Closer
|
||||||
|
|
||||||
mfs *fuse.MountedFileSystem
|
mfs *fuse.MountedFileSystem
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,6 +110,15 @@ func (t *SampleTest) TearDown() {
|
||||||
|
|
||||||
// Like TearDown, but doesn't panic.
|
// Like TearDown, but doesn't panic.
|
||||||
func (t *SampleTest) destroy() (err error) {
|
func (t *SampleTest) destroy() (err error) {
|
||||||
|
// Close what is necessary.
|
||||||
|
for _, c := range t.ToClose {
|
||||||
|
if c == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
ogletest.ExpectEq(nil, c.Close())
|
||||||
|
}
|
||||||
|
|
||||||
// Was the file system mounted?
|
// Was the file system mounted?
|
||||||
if t.mfs == nil {
|
if t.mfs == nil {
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue