Skip to content

Commit

Permalink
cleanup tmc e2e tests to remove data races
Browse files Browse the repository at this point in the history 
Signed-off-by: David Festal <dfestal@redhat.com>
  • Loading branch information
@davidfestal
davidfestal committed Mar 30, 2023
1 parent abdae2b commit 91d5124
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 27 deletions.
7 changes: 3 additions & 4 deletions test/e2e/reconciler/scheduling/upsynced_scheduling_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,12 @@ func TestUpsyncedScheduling(t *testing.T) {

// Create a client that uses the upsyncer URL
upsyncerVirtualWorkspaceConfig := rest.CopyConfig(upstreamConfig)
var upsyncerVirtualWorkspaceURL string
framework.Eventually(t, func() (found bool, message string) {
upsyncerVirtualWorkspaceURL, found, err = framework.VirtualWorkspaceURL(ctx, upstreamKcpClient, userWs, syncerFixture.GetUpsyncerVirtualWorkspaceURLs())
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVirtualWorkspaceConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, upstreamKcpClient, userWs, syncerFixture.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
}, wait.ForeverTestTimeout, time.Millisecond*100, "Upsyncer virtual workspace URL not found")
upsyncerVirtualWorkspaceConfig.Host = upsyncerVirtualWorkspaceURL
upsyncerKCPClient, err := kcpkubernetesclientset.NewForConfig(upsyncerVirtualWorkspaceConfig)
require.NoError(t, err)

Expand Down
7 changes: 3 additions & 4 deletions test/e2e/syncer/tunnels_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,12 @@ func TestSyncerTunnelFilter(t *testing.T) {

// Create a pod on the upstream namespace that looks like the downstream pod being upsynced.
upsyncerVirtualWorkspaceConfig := rest.CopyConfig(kcpServer.BaseConfig(t))
var upsyncerVirtualWorkspaceURL string
framework.Eventually(t, func() (found bool, message string) {
upsyncerVirtualWorkspaceURL, found, err = framework.VirtualWorkspaceURL(ctx, kcpClient, userWs, syncerFixture.GetUpsyncerVirtualWorkspaceURLs())
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVirtualWorkspaceConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClient, userWs, syncerFixture.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
}, wait.ForeverTestTimeout, time.Millisecond*100, "Upsyncer virtual workspace URL not found")
upsyncerVirtualWorkspaceConfig.Host = upsyncerVirtualWorkspaceURL
upsyncedClient, err := kcpkubernetesclientset.NewForConfig(upsyncerVirtualWorkspaceConfig)
require.NoError(t, err)

Expand Down
57 changes: 38 additions & 19 deletions test/e2e/virtual/syncer/virtualworkspace_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
rootComputeLogicalCluster := logicalcluster.From(export)

kubelikeVWDiscoverConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
kubelikeVWDiscoverConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, kubelikeLocationWorkspace, kubelikeSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand All @@ -300,7 +301,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
}, wait.ForeverTestTimeout, time.Millisecond*100)

wildwestVWDiscoverConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWDiscoverConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, wildwestLocationWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -405,7 +407,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
}, wait.ForeverTestTimeout, time.Millisecond*100, "token secret for default service account not created")

wildwestVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, wildwestLocationWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -533,7 +536,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.NoError(t, err)

wildwestVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, wildwestLocationWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -691,7 +695,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.NoError(t, err)

wildwestVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -934,7 +939,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.NoError(t, err)

wildwestNorthVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestNorthVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestNorthSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand All @@ -943,7 +949,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.NoError(t, err)

wildwestSouthVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestSouthVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestSouthSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -1157,15 +1164,17 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
}, wait.ForeverTestTimeout, time.Millisecond*100)

wildwestNorthVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestNorthVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestNorthSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
}, wait.ForeverTestTimeout, time.Millisecond*100, "Syncer virtual workspace URL not found")
vwNorthClusterClient, err := wildwestclientset.NewForConfig(wildwestNorthVWConfig)
require.NoError(t, err)
wildwestSouthVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestSouthVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestSouthSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -1441,7 +1450,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.Len(t, kcpCowboys.Items, 1)

wildwestVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -1547,7 +1557,8 @@ func TestSyncerVirtualWorkspace(t *testing.T) {
require.NoError(t, err)

wildwestVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
wildwestVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, consumerWorkspace, wildwestSyncer.GetSyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Syncer virtual workspace URL not found"
Expand Down Expand Up @@ -1688,7 +1699,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -1738,7 +1750,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -1791,7 +1804,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -1843,7 +1857,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -1885,7 +1900,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -1944,7 +1960,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -2006,7 +2023,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
t.Cleanup(cancelFunc)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, ws, syncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down Expand Up @@ -2096,7 +2114,8 @@ func TestUpsyncerVirtualWorkspace(t *testing.T) {
}, wait.ForeverTestTimeout, time.Millisecond*100)

upsyncerVWConfig := rest.CopyConfig(server.BaseConfig(t))
framework.Eventually(t, func() (found bool, message string) {
framework.Eventually(t, func() (found bool, _ string) {
var err error
upsyncerVWConfig.Host, found, err = framework.VirtualWorkspaceURL(ctx, kcpClusterClient, upsyncerWS, upsyncer.GetUpsyncerVirtualWorkspaceURLs())
require.NoError(t, err)
return found, "Upsyncer virtual workspace URL not found"
Expand Down

0 comments on commit 91d5124

Please sign in to comment.