Skip to content

Commit

Permalink
Fix race condition in unit test (#456)
Browse files Browse the repository at this point in the history
  • Loading branch information
ethantkoenig authored and lunny committed Dec 23, 2016
1 parent dfb5470 commit ec1fe11
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions modules/base/tool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,19 @@ func TestDetectEncoding(t *testing.T) {

// iso-8859-1: d<accented e>cor<newline>
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"
testSuccess(b, "placeholder")

// invalid bytes
b = []byte{0xfa}
_, err := DetectEncoding(b)
_, err = DetectEncoding(b)
assert.Error(t, err)
}

Expand Down

0 comments on commit ec1fe11

Please sign in to comment.