Fix CI flake

kylecarbs · kylecarbs · commit 44bd726f5e5b · 2022-03-22T21:11:53.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -210,7 +210,7 @@ jobs:
 
       - name: Test with PostgreSQL Database
         if: runner.os == 'Linux'
-        run: DB=true gotestsum --junitfile="gotests.xml" --packages="./..." --
+        run: DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
           -coverpkg=./...,github.com/coder/coder/codersdk
           -count=1 -parallel=2 -race -failfast
diff --git a/cli/start_test.go b/cli/start_test.go
@@ -31,14 +31,14 @@ func TestStart(t *testing.T) {
 			err := root.ExecuteContext(ctx)
 			require.ErrorIs(t, err, context.Canceled)
 		}()
-		var accessURL string
+		var token string
 		require.Eventually(t, func() bool {
 			var err error
-			accessURL, err = cfg.URL().Read()
+			token, err = cfg.Session().Read()
 			return err == nil
 		}, 15*time.Second, 25*time.Millisecond)
 		// Verify that authentication was properly set in dev-mode.
-		token, err := cfg.Session().Read()
+		accessURL, err := cfg.URL().Read()
 		require.NoError(t, err)
 		parsed, err := url.Parse(accessURL)
 		require.NoError(t, err)
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -21,7 +21,7 @@ var openPortMutex sync.Mutex
 
 // Open creates a new PostgreSQL server using a Docker container.
 func Open() (string, func(), error) {
-	if os.Getenv("CI") != "" {
+	if os.Getenv("DB") == "ci" {
 		// In CI, creating a Docker container for each test is slow.
 		// This expects a PostgreSQL instance with the hardcoded credentials
 		// available.
