Skip to content

Commit dae58ff

Browse files
committed
move test optimization integration tests to dedicated folder (#6047)
1 parent 4d0ed96 commit dae58ff

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

.github/workflows/test-optimization.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ jobs:
3434
env:
3535
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
3636

37+
integration:
38+
strategy:
39+
matrix:
40+
version: [oldest, maintenance, active, latest]
41+
runs-on: ubuntu-latest
42+
steps:
43+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
44+
- uses: ./.github/actions/node
45+
with:
46+
version: ${{ matrix.version }}
47+
- uses: ./.github/actions/install
48+
- run: yarn test:integration:testopt
49+
3750
integration-playwright:
3851
strategy:
3952
matrix:

integration-tests/automatic-log-submission.spec.js renamed to integration-tests/ci-visibility/automatic-log-submission.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ const {
88
createSandbox,
99
getCiVisAgentlessConfig,
1010
getCiVisEvpProxyConfig
11-
} = require('./helpers')
12-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
13-
const webAppServer = require('./ci-visibility/web-app-server')
11+
} = require('../helpers')
12+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
13+
const webAppServer = require('./web-app-server')
1414

1515
describe('test visibility automatic log submission', () => {
1616
let sandbox, cwd, receiver, childProcess, webAppPort

integration-tests/test-api-manual.spec.js renamed to integration-tests/ci-visibility/test-api-manual.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ const { assert } = require('chai')
77
const {
88
createSandbox,
99
getCiVisAgentlessConfig
10-
} = require('./helpers')
11-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
10+
} = require('../helpers')
11+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
1212
const {
1313
TEST_STATUS
14-
} = require('../packages/dd-trace/src/plugins/util/test')
14+
} = require('../../packages/dd-trace/src/plugins/util/test')
1515

1616
describe('test-api-manual', () => {
1717
let sandbox, cwd, receiver, childProcess

integration-tests/test-optimization-startup.spec.js renamed to integration-tests/ci-visibility/test-optimization-startup.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ const { exec } = require('child_process')
44

55
const { assert } = require('chai')
66

7-
const { createSandbox } = require('./helpers')
8-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
7+
const { createSandbox } = require('../helpers')
8+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
99

1010
const packageManagers = ['yarn', 'npm', 'pnpm']
1111

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"test:integration:playwright": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/playwright/*.spec.js\"",
5656
"test:integration:selenium": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/selenium/*.spec.js\"",
5757
"test:integration:vitest": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/vitest/*.spec.js\"",
58+
"test:integration:testopt": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/ci-visibility/*.spec.js\"",
5859
"test:integration:profiler": "mocha --timeout 180000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
5960
"test:integration:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
6061
"test:unit:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",

0 commit comments

Comments
 (0)