Skip to content

Remove goexperiment.synctest constraint in lib/inventory/controller_test.go #61784

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
espadolini merged 1 commit into from
Nov 26, 2025
Merged

Remove goexperiment.synctest constraint in lib/inventory/controller_test.go #61784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions lib/inventory/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"os"
"sync"
"testing"
"testing/synctest"
"time"

"github.com/google/go-cmp/cmp"
Expand Down Expand Up @@ -201,8 +202,8 @@ func (a *fakeAuth) UpsertInstance(ctx context.Context, instance types.Instance)
// an ssh service.
func TestSSHServerBasics(t *testing.T) {
t.Parallel()
maybeSynctest(t, testSSHServerBasics)
maybeSynctest(t, testSSHServerScope)
synctest.Test(t, testSSHServerBasics)
synctest.Test(t, testSSHServerScope)
}

func testSSHServerScope(t *testing.T) {
Expand Down Expand Up @@ -536,7 +537,7 @@ func testSSHServerBasics(t *testing.T) {
// an app service.
func TestAppServerBasics(t *testing.T) {
t.Parallel()
maybeSynctest(t, testAppServerBasics)
synctest.Test(t, testAppServerBasics)
}
func testAppServerBasics(t *testing.T) {
const serverID = "test-server"
Expand Down Expand Up @@ -770,7 +771,7 @@ func testAppServerBasics(t *testing.T) {
// a database server.
func TestDatabaseServerBasics(t *testing.T) {
t.Parallel()
maybeSynctest(t, testDatabaseServerBasics)
synctest.Test(t, testDatabaseServerBasics)
}
func testDatabaseServerBasics(t *testing.T) {
const serverID = "test-server"
Expand Down Expand Up @@ -1037,7 +1038,7 @@ func testDatabaseServerBasics(t *testing.T) {
// TestInstanceHeartbeat verifies basic expected behaviors for instance heartbeat.
func TestInstanceHeartbeat_Disabled(t *testing.T) {
t.Parallel()
maybeSynctest(t, testInstanceHeartbeat_Disabled)
synctest.Test(t, testInstanceHeartbeat_Disabled)
}
func testInstanceHeartbeat_Disabled(t *testing.T) {
const serverID = "test-instance"
Expand Down Expand Up @@ -1089,7 +1090,7 @@ func TestInstanceHeartbeatDisabledEnv(t *testing.T) {
// TestInstanceHeartbeat verifies basic expected behaviors for instance heartbeat.
func TestInstanceHeartbeat(t *testing.T) {
t.Parallel()
maybeSynctest(t, testInstanceHeartbeat)
synctest.Test(t, testInstanceHeartbeat)
}
func testInstanceHeartbeat(t *testing.T) {
const serverID = "test-instance"
Expand Down Expand Up @@ -1209,7 +1210,7 @@ func testInstanceHeartbeat(t *testing.T) {
// inventory control stream.
func TestUpdateLabels(t *testing.T) {
t.Parallel()
maybeSynctest(t, testUpdateLabels)
synctest.Test(t, testUpdateLabels)
}
func testUpdateLabels(t *testing.T) {
const serverID = "test-instance"
Expand Down Expand Up @@ -1282,7 +1283,7 @@ func testUpdateLabels(t *testing.T) {
// inventory control stream.
func TestAgentMetadata(t *testing.T) {
t.Parallel()
maybeSynctest(t, testAgentMetadata)
synctest.Test(t, testAgentMetadata)
}
func testAgentMetadata(t *testing.T) {
const serverID = "test-instance"
Expand Down Expand Up @@ -1559,14 +1560,14 @@ func TestGoodbye(t *testing.T) {
}
t.Run(test.name, func(t *testing.T) {
t.Parallel()
maybeSynctest(t, inner)
synctest.Test(t, inner)
})
}
}

func TestKubernetesServerBasics(t *testing.T) {
t.Parallel()
maybeSynctest(t, testKubernetesServerBasics)
synctest.Test(t, testKubernetesServerBasics)
}
func testKubernetesServerBasics(t *testing.T) {
const serverID = "test-server"
Expand Down Expand Up @@ -1797,7 +1798,7 @@ func testKubernetesServerBasics(t *testing.T) {

func TestGetSender(t *testing.T) {
t.Parallel()
maybeSynctest(t, testGetSender)
synctest.Test(t, testGetSender)
}
func testGetSender(t *testing.T) {
controller := NewController(
Expand Down Expand Up @@ -1870,7 +1871,7 @@ func testGetSender(t *testing.T) {
// TestTimeReconciliation verifies basic behavior of the time reconciliation check.
func TestTimeReconciliation(t *testing.T) {
t.Parallel()
maybeSynctest(t, testTimeReconciliation)
synctest.Test(t, testTimeReconciliation)
}
func testTimeReconciliation(t *testing.T) {
const serverID = "test-server"
Expand Down
28 changes: 0 additions & 28 deletions lib/inventory/inventory_nosynctest_test.go
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions lib/inventory/inventory_synctest_exp_test.go
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions lib/inventory/inventory_synctest_test.go
View file
Open in desktop

This file was deleted.

Loading