femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix race condition in unit test (#456)

Browse source
This commit is contained in:
Ethan Koenig 2016-12-23 01:31:22 -05:00 committed by Lunny Xiao
parent dfb547099d
commit ec1fe1183d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/base/tool_test.go
View file

@ -76,14 +76,19 @@ func TestDetectEncoding(t *testing.T) {
// iso-8859-1: d<accented e>cor<newline> // iso-8859-1: d<accented e>cor<newline>
b = []byte{0x44, 0xe9, 0x63, 0x6f, 0x72, 0x0a} b = []byte{0x44, 0xe9, 0x63, 0x6f, 0x72, 0x0a}
testSuccess(b, "ISO-8859-1") encoding, err := DetectEncoding(b)
assert.NoError(t, err)
// due to a race condition in `chardet` library, it could either detect
// "ISO-8859-1" or "IS0-8859-2" here. Technically either is correct, so
// we accept either.
assert.Contains(t, encoding, "ISO-8859")
setting.Repository.AnsiCharset = "placeholder" setting.Repository.AnsiCharset = "placeholder"
testSuccess(b, "placeholder") testSuccess(b, "placeholder")
// invalid bytes // invalid bytes
b = []byte{0xfa} b = []byte{0xfa}
_, err := DetectEncoding(b) _, err = DetectEncoding(b)
assert.Error(t, err) assert.Error(t, err)
} }