mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-10 16:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add ineffassign to the pre-comiit hooks

Browse source
This commit is contained in:
Mark Haines 2017-06-12 19:29:43 +01:00
parent 472155837b
commit 6f463ac567
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hooks/pre-commit
View file

@ -18,6 +18,7 @@ then
exit 1 exit 1
fi fi
ineffassign .
go tool vet --all --shadow ./src go tool vet --all --shadow ./src
gocyclo -over 12 src/ gocyclo -over 12 src/
gb test gb test

5
src/github.com/matrix-org/dendrite/common/test/client.go
View file

@ -136,12 +136,8 @@ func (r *Request) Run(label string, timeout time.Duration, serverCmdChan chan er
// - the server to exit with an error (error sent on serverCmdChan) // - the server to exit with an error (error sent on serverCmdChan)
// - our test timeout to expire // - our test timeout to expire
// We don't need to clean up since the main() function handles that in the event we panic // We don't need to clean up since the main() function handles that in the event we panic
var testPassed bool
select { select {
case <-time.After(timeout): case <-time.After(timeout):
if testPassed {
break
}
fmt.Printf("==TESTING== %v TIMEOUT\n", label) fmt.Printf("==TESTING== %v TIMEOUT\n", label)
if reqErr := r.LastErr.Get(); reqErr != nil { if reqErr := r.LastErr.Get(); reqErr != nil {
fmt.Println("Last /sync request error:") fmt.Println("Last /sync request error:")
@ -157,7 +153,6 @@ func (r *Request) Run(label string, timeout time.Duration, serverCmdChan chan er
panic(err) panic(err)
} }
case <-done: case <-done:
testPassed = true
fmt.Printf("==TESTING== %v PASSED\n", label) fmt.Printf("==TESTING== %v PASSED\n", label)
} }
} }