Skip to content
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.

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

Add push and pull to tracked tree view title #1678

Merged
merged 4 commits into from
May 9, 2022
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
remove flaky integration test (re-add later)
mattseddon committed May 9, 2022
commit 3efbaa96fdafdfeb4a7606ffe39080714717a9f9
36 changes: 0 additions & 36 deletions extension/src/test/suite/extension.test.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ import { afterEach, beforeEach, describe, it, suite } from 'mocha'
import { expect } from 'chai'
import { stub, restore, spy, match } from 'sinon'
import { window, commands, workspace, Uri } from 'vscode'
import { ensureFileSync } from 'fs-extra'
import {
closeAllEditors,
configurationChangeEvent,
@@ -27,10 +26,6 @@ import { OutputChannel } from '../../vscode/outputChannel'
import { WorkspaceExperiments } from '../../experiments/workspace'
import { QuickPickItemWithValue } from '../../vscode/quickPick'
import { MIN_CLI_VERSION } from '../../cli/constants'
import { dvcDemoPath } from '../util'
import { fireWatcher } from '../../fileSystem/watcher'
import { exists } from '../../fileSystem'
import { getVenvBinPath } from '../../python'

suite('Extension Test Suite', () => {
const dvcPathOption = 'dvc.dvcPath'
@@ -374,37 +369,6 @@ suite('Extension Test Suite', () => {
{ duration: 0 }
)
}).timeout(WEBVIEW_TEST_TIMEOUT)

it('should call setup if the cli is inaccessible and a virtual environment is updated with DVC', async () => {
const updateEvent = new Promise(resolve =>
workspace.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(dvcPathOption)) {
resolve(undefined)
}
})
)

workspace
.getConfiguration()
.update(dvcPathOption, join('not', 'a', 'valid', 'dvc', 'path'), false)

await updateEvent

const mockSetup = stub(Setup, 'setup')
const setupEvent = new Promise(resolve =>
mockSetup.callsFake(() => {
resolve(undefined)
return Promise.resolve(undefined)
})
)

const dvcPath = getVenvBinPath(dvcDemoPath, '.env', 'dvc')
exists(dvcPath) ? fireWatcher(dvcPath) : ensureFileSync(dvcPath)

await setupEvent

expect(mockSetup).to.be.calledOnce
}).timeout(WEBVIEW_TEST_TIMEOUT)
})

describe('dvc.stopRunningExperiment', () => {