Skip to content
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.

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

Use the correct feature flag name (and guard it properly). #2035

Merged
merged 1 commit into from
Mar 30, 2021
Merged
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
6 changes: 4 additions & 2 deletions pkg/fleets/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ func TestControllerSyncFleet(t *testing.T) {
})

t.Run("gameserverset with different image details", func(t *testing.T) {
assert.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeaturePlayerTracking)+"=true"))
utilruntime.FeatureTestMutex.Lock()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only place in our test code that didn't use the feature test mutex, which could have caused a race condition.

defer utilruntime.FeatureTestMutex.Unlock()
assert.NoError(t, utilruntime.ParseFeatures(string(utilruntime.FeatureRollingUpdateOnReady)+"=true"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this was setting the wrong feature to true, the test was always using the default feature value for rolling update on ready, which made it break when I changed the default.


f := defaultFixture()
f.Spec.Strategy.Type = appsv1.RollingUpdateDeploymentStrategyType
Expand Down Expand Up @@ -241,7 +243,7 @@ func TestControllerSyncFleet(t *testing.T) {
}
// update main resource
gsSet := ua.GetObject().(*agonesv1.GameServerSet)
assert.Equal(t, int32(3), gsSet.Spec.Replicas)
assert.Equal(t, int32(4), gsSet.Spec.Replicas)
assert.Equal(t, "gsSet1", gsSet.ObjectMeta.Name)

return true, gsSet, nil
Expand Down