third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-04-15 08:30:36 +03:00
Code Issues Projects Releases Wiki Activity

tests: Fix flake in TestHostNameCollision

Browse Source
This commit is contained in:
Andrey Petrov 2016-08-24 13:53:59 -04:00
parent a67a9d115b
commit c57a5acca7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
host_test.go
View File

@ -68,13 +68,7 @@ func TestHostNameCollision(t *testing.T) {
// Consume the initial buffer // Consume the initial buffer
scanner.Scan() scanner.Scan()
actual := scanner.Text() actual := stripPrompt(scanner.Text())
if !strings.HasPrefix(actual, "[foo] ") {
// FIXME: This is flaky. :/
t.Errorf("First client failed to get 'foo' name: %q", actual)
}
actual = stripPrompt(actual)
expected := " * foo joined. (Connected: 1)" expected := " * foo joined. (Connected: 1)"
if actual != expected { if actual != expected {
t.Errorf("Got %q; expected %q", actual, expected) t.Errorf("Got %q; expected %q", actual, expected)
@ -84,7 +78,13 @@ func TestHostNameCollision(t *testing.T) {
done <- struct{}{} done <- struct{}{}
scanner.Scan() scanner.Scan()
actual = stripPrompt(scanner.Text()) actual = scanner.Text()
// This check has to happen second because prompt doesn't always
// get set before the first message.
if !strings.HasPrefix(actual, "[foo] ") {
t.Errorf("First client failed to get 'foo' name: %q", actual)
}
actual = stripPrompt(actual)
expected = " * Guest1 joined. (Connected: 2)" expected = " * Guest1 joined. (Connected: 2)"
if actual != expected { if actual != expected {
t.Errorf("Got %q; expected %q", actual, expected) t.Errorf("Got %q; expected %q", actual, expected)