Skip to content

G
go-fuse
Commit 8c884fd9 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys
Browse files
Options

Fix data race in TestUnionFsDisappearing.

parent 5f82a882
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
unionfs/unionfs_test.go
View file @ 8c884fd9
...@@ -911,9 +911,10 @@ func TestUnionFsDisappearing(t *testing.T) { ...@@ -911,9 +911,10 @@ func TestUnionFsDisappearing(t *testing.T) {
err = os.Remove(wd + "/mnt/file") err = os.Remove(wd + "/mnt/file")
CheckSuccess(err) CheckSuccess(err)
oldRoot := wrFs.Root
state.ThreadSanitizerSync() state.ThreadSanitizerSync()
oldRoot := wrFs.Root
wrFs.Root = "/dev/null" wrFs.Root = "/dev/null"
state.ThreadSanitizerSync()
time.Sleep((3 * entryTtl) / 2) time.Sleep((3 * entryTtl) / 2)
_, err = ioutil.ReadDir(wd + "/mnt") _, err = ioutil.ReadDir(wd + "/mnt")
...@@ -930,6 +931,7 @@ func TestUnionFsDisappearing(t *testing.T) { ...@@ -930,6 +931,7 @@ func TestUnionFsDisappearing(t *testing.T) {
// Restore, and wait for caches to catch up. // Restore, and wait for caches to catch up.
wrFs.Root = oldRoot wrFs.Root = oldRoot
state.ThreadSanitizerSync()
time.Sleep((3 * entryTtl) / 2) time.Sleep((3 * entryTtl) / 2)
_, err = ioutil.ReadDir(wd + "/mnt") _, err = ioutil.ReadDir(wd + "/mnt")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7