aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-11-06 03:31:11 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-11-06 03:31:11 +0800
commit6d09468cabad74b3b1efabf7ad5a965bdb1aa04a (patch)
tree367bb858c3fded8db1814cba745655e6cc67336e
parent2334ee97d0f65e583985e7333694fb4da275fc99 (diff)
parent8e2bf42c46b8dc7d13f976c7b004001cc3d1089a (diff)
downloadgo-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar.gz
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar.bz2
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar.lz
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar.xz
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.tar.zst
go-tangerine-6d09468cabad74b3b1efabf7ad5a965bdb1aa04a.zip
Merge pull request #1967 from karalabe/fix-filter-test-datarace
event/filter: fix data race in the test
-rw-r--r--event/filter/filter_test.go29
1 files changed, 17 insertions, 12 deletions
diff --git a/event/filter/filter_test.go b/event/filter/filter_test.go
index 0cd26bfc9..dcc911245 100644
--- a/event/filter/filter_test.go
+++ b/event/filter/filter_test.go
@@ -21,35 +21,40 @@ import (
"time"
)
+// Simple test to check if baseline matching/mismatching filtering works.
func TestFilters(t *testing.T) {
- var success bool
- var failure bool
-
fm := New()
fm.Start()
+
+ // Register two filters to catch posted data
+ first := make(chan struct{})
fm.Install(Generic{
Str1: "hello",
Fn: func(data interface{}) {
- success = data.(bool)
+ first <- struct{}{}
},
})
+ second := make(chan struct{})
fm.Install(Generic{
Str1: "hello1",
Str2: "hello",
Fn: func(data interface{}) {
- failure = true
+ second <- struct{}{}
},
})
+ // Post an event that should only match the first filter
fm.Notify(Generic{Str1: "hello"}, true)
fm.Stop()
- time.Sleep(10 * time.Millisecond) // yield to the notifier
-
- if !success {
- t.Error("expected 'hello' to be posted")
+ // Ensure only the mathcing filters fire
+ select {
+ case <-first:
+ case <-time.After(100 * time.Millisecond):
+ t.Error("matching filter timed out")
}
-
- if failure {
- t.Error("hello1 was triggered")
+ select {
+ case <-second:
+ t.Error("mismatching filter fired")
+ case <-time.After(100 * time.Millisecond):
}
}