Merge branch 'main' into cleanup/delete-terraform-tests

googleforgames · Oct 20, 2023 · 7d3b003 · 7d3b003
2 parents 3c2c27f + c574a89
commit 7d3b003
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 128 deletions.
diff --git a/pkg/apis/allocation/v1/gameserverallocation_test.go b/pkg/apis/allocation/v1/gameserverallocation_test.go
@@ -1173,6 +1173,12 @@ func TestValidateListActions(t *testing.T) {
 func TestGameServerAllocationValidate(t *testing.T) {
 	t.Parallel()
 
+	runtime.FeatureTestMutex.Lock()
+	defer runtime.FeatureTestMutex.Unlock()
+	assert.NoError(t, runtime.ParseFeatures(fmt.Sprintf("%s=true&%s=false",
+		runtime.FeaturePlayerAllocationFilter,
+		runtime.FeatureCountsAndLists)))
+
 	gsa := &GameServerAllocation{}
 	gsa.ApplyDefaults()
 
@@ -1187,12 +1193,6 @@ func TestGameServerAllocationValidate(t *testing.T) {
 	assert.Equal(t, field.ErrorTypeNotSupported, allErrs[0].Type)
 	assert.Equal(t, "spec.scheduling", allErrs[0].Field)
 
-	runtime.FeatureTestMutex.Lock()
-	defer runtime.FeatureTestMutex.Unlock()
-	assert.NoError(t, runtime.ParseFeatures(fmt.Sprintf("%s=true&%s=false",
-		runtime.FeaturePlayerAllocationFilter,
-		runtime.FeatureCountsAndLists)))
-
 	// invalid player selection
 	gsa = &GameServerAllocation{
 		Spec: GameServerAllocationSpec{

diff --git a/test/e2e/gameserverallocation_test.go b/test/e2e/gameserverallocation_test.go
@@ -17,7 +17,6 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"sort"
 	"sync"
 	"testing"
 	"time"
@@ -34,7 +33,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
@@ -508,126 +506,6 @@ func TestCounterGameServerAllocation(t *testing.T) {
 	}
 }
 
-func TestCounterGameServerAllocationSorting(t *testing.T) {
-	if !runtime.FeatureEnabled(runtime.FeatureCountsAndLists) {
-		t.SkipNow()
-	}
-	t.Parallel()
-	ctx := context.Background()
-	client := framework.AgonesClient.AgonesV1()
-
-	flt := defaultFleet(framework.Namespace)
-	flt.Spec.Template.Spec.Counters = map[string]agonesv1.CounterStatus{
-		"games": {
-			Count:    0,
-			Capacity: 10,
-		},
-	}
-
-	flt, err := client.Fleets(framework.Namespace).Create(ctx, flt.DeepCopy(), metav1.CreateOptions{})
-	require.NoError(t, err)
-	defer client.Fleets(framework.Namespace).Delete(ctx, flt.ObjectMeta.Name, metav1.DeleteOptions{}) // nolint:errcheck
-	framework.AssertFleetCondition(t, flt, e2e.FleetReadyCount(flt.Spec.Replicas))
-
-	list, err := framework.ListGameServersFromFleet(flt)
-	assert.NoError(t, err)
-	// Key: GameServer name, Value: available capacity
-	gameServers := map[string]int{}
-	// Set random counts and capacities for each gameserver
-	for _, gs := range list {
-		count := rand.IntnRange(0, 99)
-		capacity := rand.IntnRange(count+1, 100) // Available Capacity will be at least 1
-		availableCapacity := capacity - count
-		gameServers[gs.ObjectMeta.Name] = availableCapacity
-
-		gsCopy := gs.DeepCopy()
-		gsCopy.Status.Counters["games"] = agonesv1.CounterStatus{
-			Count:    int64(count),
-			Capacity: int64(capacity),
-		}
-		_, err := framework.AgonesClient.AgonesV1().GameServers(framework.Namespace).Update(ctx, gsCopy, metav1.UpdateOptions{})
-		require.NoError(t, err)
-	}
-	// GameServers names sorted by available capacity, ascending. If available capacity is equal sort
-	// by name (as in pkg/gameserverallocations/allocation_cache.go)
-	sortedGs := make([]string, 0, len(gameServers))
-	for gsName := range gameServers {
-		sortedGs = append(sortedGs, gsName)
-	}
-	sort.Slice(sortedGs, func(i, j int) bool {
-		if gameServers[sortedGs[i]] != gameServers[sortedGs[j]] {
-			return gameServers[sortedGs[i]] < gameServers[sortedGs[j]]
-		}
-		return sortedGs[i] < sortedGs[j]
-	})
-
-	fleetSelector := metav1.LabelSelector{MatchLabels: map[string]string{agonesv1.FleetNameLabel: flt.ObjectMeta.Name}}
-	ready := agonesv1.GameServerStateReady
-	allocated := agonesv1.GameServerStateAllocated
-
-	testCases := map[string]struct {
-		gsa            allocationv1.GameServerAllocation
-		wantGameServer string // GameServer Name
-	}{
-		"Allocation sorting by count value, ascending": {
-			gsa: allocationv1.GameServerAllocation{
-				Spec: allocationv1.GameServerAllocationSpec{
-					Selectors: []allocationv1.GameServerSelector{
-						{LabelSelector: fleetSelector},
-					},
-					Priorities: []agonesv1.Priority{
-						{Type: agonesv1.GameServerPriorityCounter,
-							Key:   "games",
-							Order: agonesv1.GameServerPriorityAscending},
-					}}},
-			wantGameServer: sortedGs[0],
-		},
-		"Allocation sorting by count value, descending": {
-			gsa: allocationv1.GameServerAllocation{
-				Spec: allocationv1.GameServerAllocationSpec{
-					Selectors: []allocationv1.GameServerSelector{
-						{LabelSelector: fleetSelector},
-					},
-					Priorities: []agonesv1.Priority{
-						{Type: agonesv1.GameServerPriorityCounter,
-							Key:   "games",
-							Order: agonesv1.GameServerPriorityDescending},
-					}}},
-			wantGameServer: sortedGs[2],
-		},
-	}
-
-	for name, testCase := range testCases {
-		t.Run(name, func(t *testing.T) {
-
-			// Allocate GameServer
-			gsa, err := framework.AgonesClient.AllocationV1().GameServerAllocations(flt.ObjectMeta.Namespace).Create(ctx, testCase.gsa.DeepCopy(), metav1.CreateOptions{})
-			require.NoError(t, err)
-			assert.Equal(t, string(allocated), string(gsa.Status.State))
-
-			gs1, err := framework.AgonesClient.AgonesV1().GameServers(flt.ObjectMeta.Namespace).Get(ctx, gsa.Status.GameServerName, metav1.GetOptions{})
-			require.NoError(t, err)
-			assert.Equal(t, allocated, gs1.Status.State)
-			assert.NotNil(t, gs1.ObjectMeta.Annotations["agones.dev/last-allocated"])
-			assert.Equal(t, testCase.wantGameServer, gs1.ObjectMeta.Name)
-
-			// Reset any GameServers in state Allocated -> Ready. Note: This does not reset any changes to Counters.
-			list, err := framework.ListGameServersFromFleet(flt)
-			require.NoError(t, err)
-			for _, gs := range list {
-				if gs.Status.State == ready {
-					continue
-				}
-				gsCopy := gs.DeepCopy()
-				gsCopy.Status.State = ready
-				reqReadyGs, err := framework.AgonesClient.AgonesV1().GameServers(framework.Namespace).Update(ctx, gsCopy, metav1.UpdateOptions{})
-				require.NoError(t, err)
-				require.Equal(t, ready, reqReadyGs.Status.State)
-			}
-		})
-	}
-}
-
 func TestCounterGameServerAllocationActions(t *testing.T) {
 	if !runtime.FeatureEnabled(runtime.FeatureCountsAndLists) {
 		t.SkipNow()