Skip to content

[ci-visibility] Fix windows tracing test #3243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 14, 2023
Merged

[ci-visibility] Fix windows tracing test #3243

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f29e96
fix windows test
juan-fernandez Jun 14, 2023
5c30d87
fake directory
juan-fernandez Jun 14, 2023
f9692c6
stub fs too
juan-fernandez Jun 14, 2023
a7d7afc
fix assertion
juan-fernandez Jun 14, 2023
3b3f3a9
remove trace
juan-fernandez Jun 14, 2023
3d58f8d
fix for macos
juan-fernandez Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions packages/dd-trace/test/plugins/util/git.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ require('../../setup/tap')

const { execSync } = require('child_process')
const os = require('os')
const fs = require('fs')
const path = require('path')

const { GIT_REV_LIST_MAX_BUFFER } = require('../../../src/plugins/util/git')
Expand Down Expand Up @@ -33,6 +34,13 @@ const { getGitMetadata } = proxyquire('../../../src/plugins/util/git',
}
)

function getFakeDirectory () {
if (os.platform() === 'win32') {
return `C:${path.sep}tmp`
}
return '/tmp'
}

describe('git', () => {
afterEach(() => {
sanitizedExecStub.reset()
Expand Down Expand Up @@ -169,11 +177,13 @@ describe('getCommitsToUpload', () => {
})

describe('generatePackFilesForCommits', () => {
let tmpdirStub
let tmpdirStub, statSyncStub
const fakeDirectory = getFakeDirectory()
beforeEach(() => {
sinon.stub(Math, 'random').returns('0.1234')
tmpdirStub = sinon.stub(os, 'tmpdir').returns('/tmp')
tmpdirStub = sinon.stub(os, 'tmpdir').returns(fakeDirectory)
sinon.stub(process, 'cwd').returns('cwd')
statSyncStub = sinon.stub(fs, 'statSync').returns({ isDirectory: () => true })
})
afterEach(() => {
sinon.restore()
Expand All @@ -189,7 +199,7 @@ describe('generatePackFilesForCommits', () => {
}
)

const temporaryPath = path.join('/tmp', '1234')
const temporaryPath = path.join(fakeDirectory, '1234')
const packFilesToUpload = generatePackFilesForCommits(['commitSHA'])
expect(packFilesToUpload).to.eql([`${temporaryPath}-commitSHA.pack`])
})
Expand All @@ -213,6 +223,7 @@ describe('generatePackFilesForCommits', () => {

it('does not work if tmpdir does not return a folder', () => {
tmpdirStub.restore()
statSyncStub.restore()
sinon.stub(os, 'tmpdir').returns('; echo hey')
const execFileSyncSpy = sinon.stub().onCall(0).throws().onCall(1).returns(['commitSHA'])

Expand Down