Skip to content

Commit b0c3816

Browse files
Mariovidorochdev
authored andcommitted
[test-optimization] [SDTEST-2264] Upgrade attempt_to_fix to v5 (#6074)
1 parent e87a8ca commit b0c3816

File tree

25 files changed

+162
-54
lines changed

25 files changed

+162
-54
lines changed

integration-tests/cucumber/cucumber.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2509,7 +2509,7 @@ versions.forEach(version => {
25092509
assert.equal(metadata.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
25102510
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
25112511
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
2512-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
2512+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
25132513
assert.equal(metadata.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
25142514
// capabilities logic does not overwrite test session name
25152515
assert.equal(metadata.test[TEST_SESSION_NAME], 'my-test-session-name')

integration-tests/cypress/cypress.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2264,7 +2264,7 @@ moduleTypes.forEach(({
22642264
assert.equal(metadata.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
22652265
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
22662266
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
2267-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
2267+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
22682268
assert.equal(metadata.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
22692269
// capabilities logic does not overwrite test session name
22702270
assert.equal(metadata.test[TEST_SESSION_NAME], 'my-test-session-name')

integration-tests/jest/jest.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3535,7 +3535,7 @@ describe('jest CommonJS', () => {
35353535
assert.equal(metadata.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
35363536
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
35373537
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
3538-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
3538+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
35393539
assert.equal(metadata.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
35403540
// capabilities logic does not overwrite test session name
35413541
assert.equal(metadata.test[TEST_SESSION_NAME], 'my-test-session-name')

integration-tests/mocha/mocha.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3107,7 +3107,7 @@ describe('mocha CommonJS', function () {
31073107
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], undefined)
31083108
} else {
31093109
assert.equal(metadata.test[DD_CAPABILITIES_TEST_IMPACT_ANALYSIS], '1')
3110-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
3110+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
31113111
}
31123112
assert.equal(metadata.test[DD_CAPABILITIES_EARLY_FLAKE_DETECTION], '1')
31133113
assert.equal(metadata.test[DD_CAPABILITIES_AUTO_TEST_RETRIES], '1')

integration-tests/playwright/playwright.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ versions.forEach((version) => {
13701370
assert.equal(metadata.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
13711371
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
13721372
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
1373-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
1373+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
13741374
assert.equal(metadata.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
13751375
} else {
13761376
assert.equal(metadata.test[DD_CAPABILITIES_EARLY_FLAKE_DETECTION], undefined)

integration-tests/vitest/vitest.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ versions.forEach((version) => {
18671867
assert.equal(metadata.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
18681868
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
18691869
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
1870-
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '4')
1870+
assert.equal(metadata.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
18711871
assert.equal(metadata.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
18721872
// capabilities logic does not overwrite test session name
18731873
assert.equal(metadata.test[TEST_SESSION_NAME], 'my-test-session-name')

packages/datadog-plugin-cypress/src/cypress-plugin.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ const {
7878
GIT_TAG,
7979
GIT_PULL_REQUEST_BASE_BRANCH_SHA,
8080
GIT_COMMIT_HEAD_SHA,
81-
GIT_PULL_REQUEST_BASE_BRANCH
81+
GIT_PULL_REQUEST_BASE_BRANCH,
82+
GIT_COMMIT_HEAD_MESSAGE
8283
} = require('../../dd-trace/src/plugins/util/tags')
8384
const {
8485
OS_VERSION,
@@ -240,7 +241,8 @@ class CypressPlugin {
240241
[GIT_COMMIT_MESSAGE]: commitMessage,
241242
[GIT_TAG]: tag,
242243
[GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
243-
[GIT_COMMIT_HEAD_SHA]: commitHeadSha
244+
[GIT_COMMIT_HEAD_SHA]: commitHeadSha,
245+
[GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage
244246
} = this.testEnvironmentMetadata
245247

246248
this.repositoryRoot = repositoryRoot || process.cwd()
@@ -260,7 +262,8 @@ class CypressPlugin {
260262
commitMessage,
261263
tag,
262264
pullRequestBaseSha,
263-
commitHeadSha
265+
commitHeadSha,
266+
commitHeadMessage
264267
}
265268
this.finishedTestsByFile = {}
266269
this.testStatuses = {}

packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ function sendGitMetadata (url, { isEvpProxy, evpProxyPrefix }, configRepositoryU
289289
// Otherwise we unshallow and get commits to upload again
290290
log.debug('It is shallow clone, unshallowing...')
291291
if (!isFalse(getEnvironmentVariable('DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED'))) {
292-
unshallowRepository()
292+
unshallowRepository(false)
293293
}
294294

295295
// The latest commits change after unshallowing

packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ function getTestManagementTests ({
1111
isGzipCompatible,
1212
repositoryUrl,
1313
commitMessage,
14-
sha
14+
sha,
15+
commitHeadSha,
16+
commitHeadMessage
1517
}, done) {
1618
const options = {
1719
path: '/api/v2/test/libraries/test-management/tests',
@@ -45,8 +47,8 @@ function getTestManagementTests ({
4547
type: 'ci_app_libraries_tests_request',
4648
attributes: {
4749
repository_url: repositoryUrl,
48-
commit_message: commitMessage,
49-
sha
50+
commit_message: commitHeadMessage || commitMessage,
51+
sha: commitHeadSha || sha
5052
}
5153
}
5254
})

packages/dd-trace/src/plugins/ci_plugin.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ const {
5555
GIT_TAG,
5656
GIT_PULL_REQUEST_BASE_BRANCH_SHA,
5757
GIT_COMMIT_HEAD_SHA,
58-
GIT_PULL_REQUEST_BASE_BRANCH
58+
GIT_PULL_REQUEST_BASE_BRANCH,
59+
GIT_COMMIT_HEAD_MESSAGE
5960
} = require('./util/tags')
6061
const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
6162
const getDiClient = require('../ci-visibility/dynamic-instrumentation')
@@ -313,7 +314,8 @@ module.exports = class CiPlugin extends Plugin {
313314
[GIT_COMMIT_MESSAGE]: commitMessage,
314315
[GIT_TAG]: tag,
315316
[GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
316-
[GIT_COMMIT_HEAD_SHA]: commitHeadSha
317+
[GIT_COMMIT_HEAD_SHA]: commitHeadSha,
318+
[GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage
317319
} = this.testEnvironmentMetadata
318320

319321
this.repositoryRoot = repositoryRoot || process.cwd()
@@ -335,7 +337,8 @@ module.exports = class CiPlugin extends Plugin {
335337
commitMessage,
336338
tag,
337339
pullRequestBaseSha,
338-
commitHeadSha
340+
commitHeadSha,
341+
commitHeadMessage
339342
}
340343
}
341344

0 commit comments

Comments
 (0)