Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 0 additions & 43 deletions pkg/apis/agones/v1/gameserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ func TestIsBeingDeleted(t *testing.T) {
func TestGameServerApplyDefaults(t *testing.T) {
t.Parallel()

ten := int64(10)

defaultGameServerAnd := func(f func(gss *GameServerSpec)) GameServer {
gs := GameServer{
Spec: GameServerSpec{
Expand Down Expand Up @@ -206,15 +204,6 @@ func TestGameServerApplyDefaults(t *testing.T) {
gameServer: defaultGameServerAnd(func(_ *GameServerSpec) {}),
expected: wantDefaultAnd(func(_ *expected) {}),
},
"PlayerTracking=true": {
featureFlags: string(runtime.FeaturePlayerTracking) + "=true",
gameServer: defaultGameServerAnd(func(gss *GameServerSpec) {
gss.Players = &PlayersSpec{InitialCapacity: 10}
}),
expected: wantDefaultAnd(func(e *expected) {
e.alphaPlayerCapacity = &ten
}),
},
"CountsAndLists=true, Counters": {
featureFlags: string(runtime.FeatureCountsAndLists) + "=true",
gameServer: defaultGameServerAnd(func(gss *GameServerSpec) {
Expand Down Expand Up @@ -1437,38 +1426,6 @@ func TestGameServerValidateFeatures(t *testing.T) {
},
},
},
{
description: "PlayerTracking is disabled, Players field specified",
feature: fmt.Sprintf("%s=false", runtime.FeaturePlayerTracking),
gs: GameServer{
Spec: GameServerSpec{
Container: "testing",
Players: &PlayersSpec{InitialCapacity: 10},
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: "testing", Image: "testing/image"}}},
},
},
},
want: field.ErrorList{
field.Forbidden(
field.NewPath("spec", "players"),
"Value cannot be set unless feature flag PlayerTracking is enabled",
),
},
},
{
description: "PlayerTracking is enabled, Players field specified",
feature: fmt.Sprintf("%s=true", runtime.FeaturePlayerTracking),
gs: GameServer{
Spec: GameServerSpec{
Container: "testing",
Players: &PlayersSpec{InitialCapacity: 10},
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: "testing", Image: "testing/image"}}},
},
},
},
},
{
description: "CountsAndLists is disabled, Counters field specified",
feature: fmt.Sprintf("%s=false", runtime.FeatureCountsAndLists),
Comment on lines 1428 to 1431
Expand Down
51 changes: 0 additions & 51 deletions pkg/fleets/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -569,57 +569,6 @@ func TestControllerUpdateFleetStatus(t *testing.T) {

}

func TestControllerUpdateFleetPlayerStatus(t *testing.T) {
t.Parallel()

utilruntime.FeatureTestMutex.Lock()
defer utilruntime.FeatureTestMutex.Unlock()

require.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeaturePlayerTracking)+"=true"))

fleet := defaultFixture()
c, m := newFakeController()

gsSet1 := fleet.GameServerSet()
gsSet1.ObjectMeta.Name = "gsSet1"
gsSet1.Status.Players = &agonesv1.AggregatedPlayerStatus{
Count: 5,
Capacity: 10,
}

gsSet2 := fleet.GameServerSet()
gsSet2.ObjectMeta.Name = "gsSet2"
gsSet2.Status.Players = &agonesv1.AggregatedPlayerStatus{
Count: 10,
Capacity: 20,
}

m.AgonesClient.AddReactor("list", "gameserversets",
func(_ k8stesting.Action) (bool, runtime.Object, error) {
return true, &agonesv1.GameServerSetList{Items: []agonesv1.GameServerSet{*gsSet1, *gsSet2}}, nil
})

updated := false
m.AgonesClient.AddReactor("update", "fleets",
func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
ua := action.(k8stesting.UpdateAction)
fleet := ua.GetObject().(*agonesv1.Fleet)

assert.Equal(t, gsSet1.Status.Players.Count+gsSet2.Status.Players.Count, fleet.Status.Players.Count)
assert.Equal(t, gsSet1.Status.Players.Capacity+gsSet2.Status.Players.Capacity, fleet.Status.Players.Capacity)

return true, fleet, nil
})

ctx, cancel := agtesting.StartInformers(m, c.fleetSynced, c.gameServerSetSynced)
defer cancel()

err := c.updateFleetStatus(ctx, fleet)
assert.NoError(t, err)
assert.True(t, updated)
}

// nolint:dupl // Linter errors on lines are duplicate of TestControllerUpdateFleetListStatus
func TestControllerUpdateFleetCounterStatus(t *testing.T) {
t.Parallel()
Expand Down
34 changes: 0 additions & 34 deletions pkg/gameserversets/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,40 +314,6 @@ func TestComputeStatus(t *testing.T) {
}
})

t.Run("player tracking", func(t *testing.T) {
utilruntime.FeatureTestMutex.Lock()
defer utilruntime.FeatureTestMutex.Unlock()

require.NoError(t, utilruntime.ParseFeatures(fmt.Sprintf("%s=true", utilruntime.FeaturePlayerTracking)))

gsSet := defaultFixture()
var list []*agonesv1.GameServer
gs1 := gsWithState(agonesv1.GameServerStateAllocated)
gs1.Status.Players = &agonesv1.PlayerStatus{Count: 5, Capacity: 10}
gs2 := gsWithState(agonesv1.GameServerStateReserved)
gs2.Status.Players = &agonesv1.PlayerStatus{Count: 10, Capacity: 15}
gs3 := gsWithState(agonesv1.GameServerStateCreating)
gs3.Status.Players = &agonesv1.PlayerStatus{Count: 20, Capacity: 30}
gs4 := gsWithState(agonesv1.GameServerStateReady)
gs4.Status.Players = &agonesv1.PlayerStatus{Count: 15, Capacity: 30}
list = append(list, gs1, gs2, gs3, gs4)

expected := agonesv1.GameServerSetStatus{
Replicas: 4,
ReadyReplicas: 1,
ReservedReplicas: 1,
AllocatedReplicas: 1,
Players: &agonesv1.AggregatedPlayerStatus{
Count: 30,
Capacity: 55,
},
Counters: map[string]agonesv1.AggregatedCounterStatus{},
Lists: map[string]agonesv1.AggregatedListStatus{},
}

assert.Equal(t, expected, computeStatus(gsSet, list))
})

t.Run("counters", func(t *testing.T) {
utilruntime.FeatureTestMutex.Lock()
defer utilruntime.FeatureTestMutex.Unlock()
Expand Down
Loading