Skip to content

Commit b4246be

Browse files
committed
e2e/cache: inlint scenarios to make them runnable from Goland
Signed-off-by: Dr. Stefan Schimanski <[email protected]>
1 parent 0cac694 commit b4246be

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

test/e2e/reconciler/cache/replication_test.go

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,6 @@ type testScenario struct {
5757
work func(ctx context.Context, t *testing.T, server framework.RunningServer, kcpShardClusterDynamicClient kcpdynamic.ClusterInterface, cacheKcpClusterDynamicClient kcpdynamic.ClusterInterface)
5858
}
5959

60-
// scenarios all test scenarios that will be run against an environment provided by the test binary.
61-
var scenarios = []testScenario{
62-
{"TestReplicateAPIExport", replicateAPIExportScenario},
63-
{"TestReplicateAPIExportNegative", replicateAPIExportNegativeScenario},
64-
{"TestReplicateAPIResourceSchema", replicateAPIResourceSchemaScenario},
65-
{"TestReplicateAPIResourceSchemaNegative", replicateAPIResourceSchemaNegativeScenario},
66-
{"TestReplicateWorkspaceType", replicateWorkspaceTypeScenario},
67-
{"TestReplicateWorkspaceTypeNegative", replicateWorkspaceTypeNegativeScenario},
68-
}
69-
70-
// disruptiveScenarios contains a list of scenarios that will be run in a private environment
71-
// so that they don't disrupt other tests.
72-
var disruptiveScenarios = []testScenario{
73-
{"TestReplicateShard", replicateShardScenario},
74-
{"TestReplicateShardNegative", replicateShardNegativeScenario},
75-
}
76-
7760
// replicateAPIResourceSchemaScenario tests if an APIResourceSchema is propagated to the cache server.
7861
// The test exercises creation, modification and removal of the APIResourceSchema object.
7962
func replicateAPIResourceSchemaScenario(ctx context.Context, t *testing.T, server framework.RunningServer, kcpShardClusterDynamicClient kcpdynamic.ClusterInterface, cacheKcpClusterDynamicClient kcpdynamic.ClusterInterface) {
@@ -436,6 +419,14 @@ func TestReplication(t *testing.T) {
436419
cacheKcpClusterDynamicClient, err := kcpdynamic.NewForConfig(cacheClientRT)
437420
require.NoError(t, err)
438421

422+
scenarios := []testScenario{
423+
{"APIExport", replicateAPIExportScenario},
424+
{"APIExportNegative", replicateAPIExportNegativeScenario},
425+
{"APIResourceSchema", replicateAPIResourceSchemaScenario},
426+
{"APIResourceSchemaNegative", replicateAPIResourceSchemaNegativeScenario},
427+
{"WorkspaceType", replicateWorkspaceTypeScenario},
428+
{"WorkspaceTypeNegative", replicateWorkspaceTypeNegativeScenario},
429+
}
439430
for _, scenario := range scenarios {
440431
scenario := scenario
441432
t.Run(scenario.name, func(t *testing.T) {
@@ -450,6 +441,10 @@ func TestReplicationDisruptive(t *testing.T) {
450441
t.Parallel()
451442
framework.Suite(t, "control-plane")
452443

444+
disruptiveScenarios := []testScenario{
445+
{"Shard", replicateShardScenario},
446+
{"ShardNegative", replicateShardNegativeScenario},
447+
}
453448
for _, scenario := range disruptiveScenarios {
454449
scenario := scenario
455450

0 commit comments

Comments
 (0)