STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge NewClient and JoinWorkspace into Connect

Browse source
This commit is contained in:
Alan Donovan 2021-09-21 12:44:30 -04:00
parent 7765628033
commit b3b675d108
4 changed files with 61 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

46
client_test.go
View file

@ -13,37 +13,7 @@ import (
"github.com/sourcegraph/jsonrpc2"
)
func TestNewClient(t *testing.T) {
client, err := NewClient()
if err != nil {
t.Errorf("error creating new client: %v", err)
}
if client == nil {
t.Error("client is nil")
}
}
func TestNewClientValidConnection(t *testing.T) {
connection := Connection{"1", "2", "3", "4"}
client, err := NewClient(WithConnection(connection))
if err != nil {
t.Errorf("error creating new client: %v", err)
}
if client == nil {
t.Error("client is nil")
}
}
func TestNewClientWithInvalidConnection(t *testing.T) {
connection := Connection{}
if _, err := NewClient(WithConnection(connection)); err == nil {
t.Error("err is nil")
}
}
func TestJoinSession(t *testing.T) {
func TestConnect(t *testing.T) {
connection := Connection{
SessionID: "session-id",
SessionToken: "session-token",
@ -83,21 +53,11 @@ func TestJoinSession(t *testing.T) {
ctx := context.Background()
tlsConfig := WithTLSConfig(&tls.Config{InsecureSkipVerify: true})
client, err := NewClient(WithConnection(connection), tlsConfig)
if err != nil {
t.Errorf("error creating new client: %v", err)
}
done := make(chan error)
go func() {
session, err := client.JoinWorkspace(ctx)
if err != nil {
done <- fmt.Errorf("error joining workspace: %v", err)
return
}
_ = session
done <- nil
_, err := Connect(ctx, WithConnection(connection), tlsConfig) // ignore session
done <- err
}()
select {