Skip to content

Commit

Permalink
(fix) internal/civisibility/coverage: [APMLP-379] fix TestCollectCove…
Browse files Browse the repository at this point in the history
…rageAfterTestExecution flaky test - v2 (#3170)
  • Loading branch information
tonyredondo authored Feb 11, 2025
1 parent 5cdc0a4 commit 28e6c93
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,8 @@ func (t *testCoverage) CollectCoverageAfterTestExecution() {
return
}

t.postCoverageFilename = filepath.Join(temporaryDir, fmt.Sprintf("%d-%d-%d-post.out", t.moduleID, t.suiteID, t.testID))
_, err := tearDown(t.postCoverageFilename, "")
if err != nil {
log.Debug("civisibility.coverage: error getting coverage file: %v", err)
telemetry.CodeCoverageErrors()
if t.getCoverageData() != nil {
return
}

var pChannel = make(chan struct{})
Expand All @@ -232,6 +229,18 @@ func (t *testCoverage) CollectCoverageAfterTestExecution() {
}()
}

// getCoverageData gets the coverage data.
func (t *testCoverage) getCoverageData() error {
t.postCoverageFilename = filepath.Join(temporaryDir, fmt.Sprintf("%d-%d-%d-post.out", t.moduleID, t.suiteID, t.testID))
_, err := tearDown(t.postCoverageFilename, "")
if err != nil {
log.Debug("civisibility.coverage: error getting coverage file: %v", err)
telemetry.CodeCoverageErrors()
}

return err
}

// processCoverageData processes the coverage data.
func (t *testCoverage) processCoverageData() {
if t.preCoverageFilename == "" ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ func TestCollectCoverageAfterTestExecution(t *testing.T) {
f.WriteString("mode: count\n")
f.Close()

tc.CollectCoverageAfterTestExecution()
err = tc.getCoverageData()
if err != nil {
t.Errorf("getCoverageData returned error: %v", err)
}

if tc.postCoverageFilename == "" {
t.Error("postCoverageFilename is empty after CollectCoverageAfterTestExecution")
Expand Down

0 comments on commit 28e6c93

Please sign in to comment.