Skip to content

Commit

Permalink
resource_manager: fix unstable test TestSkipConsumptionForBackgroundJ…
Browse files Browse the repository at this point in the history
…obs (#7130)

close #7129

Co-authored-by: ShuNing <nolouch@gmail.com>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Sep 25, 2023
1 parent b66ddc3 commit 3c632b1
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions tests/integrations/mcs/resourcemanager/resource_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ func (suite *resourceManagerClientTestSuite) TestRemoveStaleResourceGroup() {
controller.Stop()
}

func (suite *resourceManagerClientTestSuite) TestSkipConsumptionForBackgroundJobs() {
func (suite *resourceManagerClientTestSuite) TestCheckBackgroundJobs() {
re := suite.Require()
cli := suite.client

Expand All @@ -1226,7 +1226,7 @@ func (suite *resourceManagerClientTestSuite) TestSkipConsumptionForBackgroundJob
c, _ := controller.NewResourceGroupController(suite.ctx, 1, cli, cfg)
c.Start(suite.ctx)

resourceGroupName := suite.initGroups[1].Name
resourceGroupName := suite.initGroups[0].Name
re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_default"))
// test fallback for nil.
re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_lightning"))
Expand Down Expand Up @@ -1257,9 +1257,15 @@ func (suite *resourceManagerClientTestSuite) TestSkipConsumptionForBackgroundJob
re.NoError(err)
re.Contains(resp, "Success!")
// wait for watch event modify.
time.Sleep(time.Millisecond * 100)
testutil.Eventually(re, func() bool {
meta := c.GetActiveResourceGroup("default")
if meta != nil && meta.BackgroundSettings != nil {
return len(meta.BackgroundSettings.JobTypes) == 2
}
return false
}, testutil.WithTickInterval(50*time.Millisecond))

resourceGroupName = suite.initGroups[1].Name
resourceGroupName = suite.initGroups[0].Name
re.False(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_default"))
// test fallback for `"lightning", "ddl"`.
re.True(c.IsBackgroundRequest(suite.ctx, resourceGroupName, "internal_lightning"))
Expand Down

0 comments on commit 3c632b1

Please sign in to comment.