Ignore context cancelation error

Author: erthalion

integration-tests/pkg/executor/executor_cri.go

@@ -294,7 +294,7 @@ func (c *criExecutor) GetContainerStats(ctx context.Context, containerID string)
 
 	stats, err := c.runtimeService.ContainerStats(ctx, containerID)
 	if err != nil {
-		return nil, fmt.Errorf("error getting container stats: %w", err)
+		return nil, err
 	}
 
 	return &ContainerStat{

integration-tests/pkg/executor/executor_docker_api.go

@@ -99,7 +99,7 @@ func (d *dockerAPIExecutor) GetContainerStats(ctx context.Context, containerID s
 	// instructs the server to get a single stat, rather than waiting for more.
 	statsResp, err := d.client.ContainerStatsOneShot(ctx, containerID)
 	if err != nil {
-		return nil, fmt.Errorf("error getting container stats: %w", err)
+		return nil, err
 	}
 
 	var stats container.StatsResponse
@@ -108,7 +108,7 @@ func (d *dockerAPIExecutor) GetContainerStats(ctx context.Context, containerID s
 	if err := decoder.Decode(&stats); err == io.EOF {
 		return nil, nil
 	} else if err != nil {
-		return nil, fmt.Errorf("error decoding container stats: %w", err)
+		return nil, err
 	}
 
 	return &ContainerStat{

integration-tests/suites/base.go

@@ -197,7 +197,10 @@ func (s *IntegrationTestSuiteBase) SnapshotContainerStats() {
 	}
 
 	stat, err := s.Executor().GetContainerStats(s.statsCtx, s.Collector().ContainerID())
-	if err != nil {
+
+	// The stats context will be canceled at the end of the test. If it happens
+	// while the request is in flight, ignore the error.
+	if err != nil && err != context.Canceled {
 		assert.FailNowf(s.T(), "fail to get container stats", "%v", err)
 		return
 	}