From eaa0177b80daf4c82ffae826983c5d3d245f6c5b Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Tue, 11 Aug 2015 06:26:46 +0000 Subject: [PATCH] Clean up mappings even on assertion failure. --- samples/flushfs/flush_fs_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/samples/flushfs/flush_fs_test.go b/samples/flushfs/flush_fs_test.go index 278f0ba..e787998 100644 --- a/samples/flushfs/flush_fs_test.go +++ b/samples/flushfs/flush_fs_test.go @@ -590,6 +590,8 @@ func (t *NoErrorsTest) Mmap_NoMsync_MunmapBeforeClose() { syscall.MAP_SHARED) AssertEq(nil, err) + defer syscall.Munmap(data) + AssertEq("taco", string(data)) // Modify the contents. @@ -638,6 +640,8 @@ func (t *NoErrorsTest) Mmap_NoMsync_CloseBeforeMunmap() { syscall.MAP_SHARED) AssertEq(nil, err) + defer syscall.Munmap(data) + AssertEq("taco", string(data)) // Close the file. We should see a flush. @@ -682,6 +686,8 @@ func (t *NoErrorsTest) Mmap_WithMsync_MunmapBeforeClose() { syscall.MAP_SHARED) AssertEq(nil, err) + defer syscall.Munmap(data) + AssertEq("taco", string(data)) // Modify the contents. @@ -738,6 +744,8 @@ func (t *NoErrorsTest) Mmap_WithMsync_CloseBeforeMunmap() { syscall.MAP_SHARED) AssertEq(nil, err) + defer syscall.Munmap(data) + AssertEq("taco", string(data)) // Close the file. We should see a flush. @@ -941,6 +949,7 @@ func (t *FsyncErrorTest) Msync() { syscall.MAP_SHARED) AssertEq(nil, err) + defer syscall.Munmap(data) // msync the mapping. err = msync(data)