Apr 6, 2023 · Apr 6, 2023
diff --git a/agent/reaper/reaper_test.go b/agent/reaper/reaper_test.go
 // Don't run the reaper test in CI. It does weird
 // things like forkexecing which may have unintended
 // consequences in CI.
 if_, ok := os.LookupEnv("CI"); ok {
 iftestutil.InCI() {
 t.Skip("Detected CI, skipping reaper tests")
 }

 // Don't run the reaper test in CI. It does weird
 // things like forkexecing which may have unintended
 // consequences in CI.
 if_, ok := os.LookupEnv("CI"); ok {
 iftestutil.InCI() {
 t.Skip("Detected CI, skipping reaper tests")
 }

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
 var update []codersdk.WorkspaceAgentMetadata

 check := func(want codersdk.WorkspaceAgentMetadataResult, got codersdk.WorkspaceAgentMetadata) {
 require.Greater(t, got.Result.CollectedAt, want.CollectedAt)
 require.Equal(t, want.Value, got.Result.Value)
 require.Equal(t, want.Error, got.Result.Error)

 if testutil.InCI() && (runtime.GOOS == "windows" || testutil.InRaceMode()) {
 // Avoid testing timings when flake chance is high.
 return
 }
 require.WithinDuration(t, got.Result.CollectedAt, want.CollectedAt, time.Second)
 ageImpliedNow := got.Result.CollectedAt.Add(time.Duration(got.Result.Age) * time.Second)
 // We use a long WithinDuration to tolerate slow CI, but we're still making sure
 // that Age is within the ballpark.
 require.WithinDuration(
 t, time.Now(), ageImpliedNow, time.Second*10,
 )
 require.Equal(t, want.Value, got.Result.Value)
 require.Equal(t, want.Error, got.Result.Error)
 }

 wantMetadata1 := codersdk.WorkspaceAgentMetadataResult{
diff --git a/helm/tests/chart_test.go b/helm/tests/chart_test.go

 "github.com/stretchr/testify/require"
 "golang.org/x/xerrors"

 "github.com/coder/coder/testutil"
 )

 // These tests run `helm template` with the values file specified in each test
 if *UpdateGoldenFiles {
 t.Skip("Golden files are being updated. Skipping test.")
 }
 if_, runningInCI := os.LookupEnv("CI"); runningInCI {
 iftestutil.InCI() {
 switch runtime.GOOS {
 case "windows", "darwin":
 t.Skip("Skipping tests on Windows and macOS in CI")
diff --git a/testutil/ci.go b/testutil/ci.go
 package testutil

 import (
 "flag"
 "os"
 )

 func InCI() bool {
 _, ok := os.LookupEnv("CI")
 return ok
 }

 func InRaceMode() bool {
 fl := flag.Lookup("race")
 return fl != nil && fl.Value.String() == "true"
 }
diff --git a/testutil/duration.go b/testutil/duration.go

 package testutil

 import "time"
 import (
 "time"
 )

 // Constants for timing out operations, usable for creating contexts
 // that timeout or in require.Eventually.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,7 +23,7 @@ func TestReap(t *testing.T) {
		// Don't run the reaper test in CI. It does weird
		// things like forkexecing which may have unintended
		// consequences in CI.
		if_, ok := os.LookupEnv("CI"); ok {
		iftestutil.InCI() {
		t.Skip("Detected CI, skipping reaper tests")
		}

Expand DownExpand Up		@@ -73,7 +73,7 @@ func TestReapInterrupt(t *testing.T) {
		// Don't run the reaper test in CI. It does weird
		// things like forkexecing which may have unintended
		// consequences in CI.
		if_, ok := os.LookupEnv("CI"); ok {
		iftestutil.InCI() {
		t.Skip("Detected CI, skipping reaper tests")
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1353,16 +1353,20 @@ func TestWorkspaceAgent_Metadata(t *testing.T) {
		var update []codersdk.WorkspaceAgentMetadata

		check := func(want codersdk.WorkspaceAgentMetadataResult, got codersdk.WorkspaceAgentMetadata) {
		require.Greater(t, got.Result.CollectedAt, want.CollectedAt)
		require.Equal(t, want.Value, got.Result.Value)
		require.Equal(t, want.Error, got.Result.Error)

		if testutil.InCI() && (runtime.GOOS == "windows" \|\| testutil.InRaceMode()) {
		// Avoid testing timings when flake chance is high.
		return
		}
		require.WithinDuration(t, got.Result.CollectedAt, want.CollectedAt, time.Second)
		ageImpliedNow := got.Result.CollectedAt.Add(time.Duration(got.Result.Age) * time.Second)
		// We use a long WithinDuration to tolerate slow CI, but we're still making sure
		// that Age is within the ballpark.
		require.WithinDuration(
		t, time.Now(), ageImpliedNow, time.Second*10,
		)
		require.Equal(t, want.Value, got.Result.Value)
		require.Equal(t, want.Error, got.Result.Error)
		}

		wantMetadata1 := codersdk.WorkspaceAgentMetadataResult{
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,8 @@ import (

		"github.com/stretchr/testify/require"
		"golang.org/x/xerrors"

		"github.com/coder/coder/testutil"
		)

		// These tests run `helm template` with the values file specified in each test
Expand DownExpand Up		@@ -54,7 +56,7 @@ func TestRenderChart(t *testing.T) {
		if *UpdateGoldenFiles {
		t.Skip("Golden files are being updated. Skipping test.")
		}
		if_, runningInCI := os.LookupEnv("CI"); runningInCI {
		iftestutil.InCI() {
		switch runtime.GOOS {
		case "windows", "darwin":
		t.Skip("Skipping tests on Windows and macOS in CI")
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,16 @@
		package testutil

		import (
		"flag"
		"os"
		)

		func InCI() bool {
		_, ok := os.LookupEnv("CI")
		return ok
		}

		func InRaceMode() bool {
		fl := flag.Lookup("race")
		return fl != nil && fl.Value.String() == "true"
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,9 @@

		package testutil

		import "time"
		import (
		"time"
		)

		// Constants for timing out operations, usable for creating contexts
		// that timeout or in require.Eventually.
Expand Down