Skip to content

chore: Add test helpers to improve coverage #166

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 18 commits into from
Feb 6, 2022
Merged

chore: Add test helpers to improve coverage #166

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7f2a99f
chore: Rename ProjectHistory to ProjectVersion
kylecarbs Feb 5, 2022
7c46342
Rename files
kylecarbs Feb 5, 2022
9e04a0e
Standardize tests a bit more
kylecarbs Feb 5, 2022
9cd8b43
Remove Server struct from coderdtest
kylecarbs Feb 5, 2022
be3e6ac
Improve test coverage for workspace history
kylecarbs Feb 5, 2022
6e4ca5a
Merge branch 'main' into testcleanup
kylecarbs Feb 5, 2022
ab4dcb1
Fix linting errors
kylecarbs Feb 5, 2022
57efae2
Fix coderd test leak
kylecarbs Feb 5, 2022
9fa815c
Fix coderd test leak
kylecarbs Feb 5, 2022
0fb2a5a
Merge branch 'testcleanup' of github.com:coder/coder into testcleanup
kylecarbs Feb 5, 2022
c50cee0
Improve workspace history logs
kylecarbs Feb 5, 2022
e202b2d
Standardize test structure for codersdk
kylecarbs Feb 5, 2022
ca31d90
Fix linting errors
kylecarbs Feb 5, 2022
673c59d
Fix WebSocket compression
kylecarbs Feb 5, 2022
aad577f
Update coderd/workspaces.go
kylecarbs Feb 5, 2022
6c39920
Add test for listing project parameters
kylecarbs Feb 5, 2022
a4d17d0
Cache npm dependencies with setup node
kylecarbs Feb 5, 2022
a8a0531
Remove windows npm cache key
kylecarbs Feb 5, 2022
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
Prev Previous commit
Next Next commit
Fix coderd test leak
  • Loading branch information
@kylecarbs
kylecarbs committed Feb 5, 2022
commit 57efae22337182e8a82d16afafa83da42580b0fe
2 changes: 0 additions & 2 deletions coderd/coderdtest/coderdtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package coderdtest
import (
"context"
"database/sql"
"fmt"
"io"
"net/http/httptest"
"net/url"
Expand Down Expand Up @@ -154,7 +153,6 @@ func AwaitProjectVersionImported(t *testing.T, client *codersdk.Client, organiza
var err error
projectVersion, err = client.ProjectVersion(context.Background(), organization, project, version)
require.NoError(t, err)
fmt.Printf("GOT: %s\n", projectVersion.Import.Status)
return projectVersion.Import.Status.Completed()
}, 3*time.Second, 25*time.Millisecond)
return projectVersion
Expand Down
20 changes: 18 additions & 2 deletions coderd/coderdtest/coderdtest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package coderdtest_test

import (
"context"
"testing"

"go.uber.org/goleak"

"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/database"
)

func TestMain(m *testing.M) {
Expand All @@ -15,6 +20,17 @@ func TestMain(m *testing.M) {
func TestNew(t *testing.T) {
t.Parallel()
client := coderdtest.New(t)
_ = coderdtest.CreateInitialUser(t, client)
_ = coderdtest.NewProvisionerDaemon(t, client)
user := coderdtest.CreateInitialUser(t, client)
closer := coderdtest.NewProvisionerDaemon(t, client)
project := coderdtest.CreateProject(t, client, user.Organization)
version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
history, err := client.CreateWorkspaceHistory(context.Background(), "me", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
ProjectVersionID: version.ID,
Transition: database.WorkspaceTransitionCreate,
})
require.NoError(t, err)
coderdtest.AwaitWorkspaceHistoryProvisioned(t, client, "me", workspace.Name, history.Name)
closer.Close()
}
5 changes: 4 additions & 1 deletion coderd/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"reflect"
"time"
Expand Down Expand Up @@ -75,7 +76,9 @@ func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request)
// Multiplexes the incoming connection using yamux.
// This allows multiple function calls to occur over
// the same connection.
session, err := yamux.Server(websocket.NetConn(r.Context(), conn, websocket.MessageBinary), nil)
config := yamux.DefaultConfig()
config.LogOutput = io.Discard
session, err := yamux.Server(websocket.NetConn(r.Context(), conn, websocket.MessageBinary), config)
if err != nil {
_ = conn.Close(websocket.StatusInternalError, fmt.Sprintf("multiplex server: %s", err))
return
Expand Down
5 changes: 4 additions & 1 deletion codersdk/provisioners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package codersdk
import (
"context"
"encoding/json"
"io"
"net/http"

"github.com/hashicorp/yamux"
Expand Down Expand Up @@ -42,7 +43,9 @@ func (c *Client) ProvisionerDaemonClient(ctx context.Context) (proto.DRPCProvisi
}
return nil, readBodyAsError(res)
}
session, err := yamux.Client(websocket.NetConn(context.Background(), conn, websocket.MessageBinary), nil)
config := yamux.DefaultConfig()
config.LogOutput = io.Discard
session, err := yamux.Client(websocket.NetConn(ctx, conn, websocket.MessageBinary), config)
if err != nil {
return nil, xerrors.Errorf("multiplex client: %w", err)
}
Expand Down
6 changes: 4 additions & 2 deletions provisioner/echo/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ func (*echo) Parse(request *proto.Parse_Request, stream proto.DRPCProvisioner_Pa
return err
}
}
return nil
<-stream.Context().Done()
return stream.Context().Err()
}

// Provision reads requests from the provided directory to stream responses.
Expand Down Expand Up @@ -97,7 +98,8 @@ func (*echo) Provision(request *proto.Provision_Request, stream proto.DRPCProvis
return err
}
}
return nil
<-stream.Context().Done()
return stream.Context().Err()
}

type Responses struct {
Expand Down