Skip to content

Fixed discovery tests timeouts #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2020
Merged

Fixed discovery tests timeouts #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions arduino/discovery/discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,41 @@ import (
"testing"
"time"

"github.com/arduino/arduino-cli/executils"
"github.com/stretchr/testify/require"
)

func TestDiscoveryStdioHandling(t *testing.T) {
disc, err := New("test", "go", "run", "testdata/cat/main.go") // copy stdin to stdout
builder, err := executils.NewProcess("go", "build")
require.NoError(t, err)
builder.SetDir("testdata/cat")
require.NoError(t, builder.Run())

disc, err := New("test", "testdata/cat/cat") // copy stdin to stdout
require.NoError(t, err)

_, err = disc.outgoingCommandsPipe.Write([]byte(`{ "eventType":`)) // send partial JSON
require.NoError(t, err)
msg, err := disc.waitMessage(time.Millisecond * 1000)
msg, err := disc.waitMessage(time.Millisecond * 100)
require.Error(t, err)
require.Nil(t, msg)

_, err = disc.outgoingCommandsPipe.Write([]byte(`"ev1" }{ `)) // complete previous json and start another one
require.NoError(t, err)

msg, err = disc.waitMessage(time.Millisecond * 1000)
msg, err = disc.waitMessage(time.Millisecond * 100)
require.NoError(t, err)
require.NotNil(t, msg)
require.Equal(t, "ev1", msg.EventType)

msg, err = disc.waitMessage(time.Millisecond * 1000)
msg, err = disc.waitMessage(time.Millisecond * 100)
require.Error(t, err)
require.Nil(t, msg)

_, err = disc.outgoingCommandsPipe.Write([]byte(`"eventType":"ev2" }`)) // complete previous json
require.NoError(t, err)

msg, err = disc.waitMessage(time.Millisecond * 1000)
msg, err = disc.waitMessage(time.Millisecond * 100)
require.NoError(t, err)
require.NotNil(t, msg)
require.Equal(t, "ev2", msg.EventType)
Expand All @@ -57,7 +63,7 @@ func TestDiscoveryStdioHandling(t *testing.T) {

err = disc.outgoingCommandsPipe.(io.ReadCloser).Close()
require.NoError(t, err)
time.Sleep(time.Millisecond * 200)
time.Sleep(time.Millisecond * 100)

require.False(t, disc.IsAlive())
}
2 changes: 2 additions & 0 deletions arduino/discovery/testdata/cat/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cat
cat.exe