Skip to content

fix: Re-enable parallel run of Postgres-backed tests #119

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

fix: Re-enable parallel run of Postgres-backed tests #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
783f950
Fix parallel run of postgres tests
bryphe-coder Feb 1, 2022
8e07bee
bump
bryphe-coder Feb 1, 2022
9baafb2
Un-export GetFreePort
bryphe-coder Feb 1, 2022
deb9b24
Clean up getFreePort
bryphe-coder Feb 1, 2022
b21189f
Merge branch 'main' into bryphe/fix/docker-port-overlap
kylecarbs Feb 1, 2022
02aaf40
Merge branch 'main' into bryphe/fix/docker-port-overlap
bryphe-coder Feb 1, 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
2 changes: 1 addition & 1 deletion .github/workflows/coder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
run:
DB=true gotestsum --jsonfile="gotests.json" --packages="./..." --
-covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
-count=1 -race -parallel=1
-count=1 -race -parallel=2

- uses: codecov/codecov-action@v2
if: github.actor != 'dependabot[bot]'
Expand Down
30 changes: 30 additions & 0 deletions database/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"database/sql"
"fmt"
"io/ioutil"
"net"
"os"
"time"

Expand All @@ -22,6 +23,13 @@ func Open() (string, func(), error) {
if err != nil {
return "", nil, xerrors.Errorf("create tempdir: %w", err)
}
// Pick an explicit port on the host to connect to 5432.
// This is necessary so we can configure the port to only use ipv4.
port, err := getFreePort()
if err != nil {
return "", nil, xerrors.Errorf("Unable to get free port: %w", err)
}

resource, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "11",
Expand All @@ -33,6 +41,15 @@ func Open() (string, func(), error) {
"PGDATA=/tmp",
"listen_addresses = '*'",
},
PortBindings: map[docker.Port][]docker.PortBinding{
"5432/tcp": {{
// Manually specifying a host IP tells Docker just to use an IPV4 address.
// If we don't do this, we hit a fun bug:
// https://github.com/moby/moby/issues/42442
// where the ipv4 and ipv6 ports might be _different_ and collide with other running docker containers.
HostIP: "0.0.0.0",
HostPort: fmt.Sprintf("%d", port)}},
},
Mounts: []string{
// The postgres image has a VOLUME parameter in it's image.
// If we don't mount at this point, Docker will allocate a
Expand Down Expand Up @@ -76,3 +93,16 @@ func Open() (string, func(), error) {
_ = os.RemoveAll(tempDir)
}, nil
}

// getFreePort asks the kernel for a free open port that is ready to use.
func getFreePort() (port int, err error) {
// Binding to port 0 tells the OS to grab a port for us:
// https://stackoverflow.com/questions/1365265/on-localhost-how-do-i-pick-a-free-port-number
listener, err := net.Listen("tcp", "localhost:0")
if err != nil {
return 0, err
}

defer listener.Close()
return listener.Addr().(*net.TCPAddr).Port, nil
}