Skip to content

Commit 5e8d460

Browse files
authored
Suppress integration test warninngs (#3046)
* suppress binding error for callsFake * suppress uri file warnings
1 parent 19ad1c4 commit 5e8d460

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

extension/src/test/suite/config.test.ts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as Extensions from '../../vscode/extensions'
99
import * as Python from '../../extensions/python'
1010
import * as WorkspaceFolders from '../../vscode/workspaceFolders'
1111
import { ConfigKey, setConfigValue } from '../../vscode/config'
12+
import { dvcDemoPath } from '../util'
1213

1314
suite('Config Test Suite', () => {
1415
const disposable = Disposable.fn()
@@ -76,15 +77,13 @@ suite('Config Test Suite', () => {
7677
setupTriggeredCount = setupTriggeredCount + 1
7778
})
7879
)
79-
const mockDvcMonoRepo = Uri.file(resolve('mono-repo')).fsPath
80+
const mockDvcMonoRepo = Uri.file(resolve(dvcDemoPath)).fsPath
8081
const mockGetWorkspaceFolders = stub(
8182
WorkspaceFolders,
8283
'getWorkspaceFolders'
8384
).returns([mockDvcMonoRepo])
84-
const mockDvcSubRoot1 = Uri.file(join(mockDvcMonoRepo, 'subroot1')).fsPath
85-
const mockDvcSubRoot2 = Uri.file(
86-
join(mockDvcMonoRepo, 'subroot2', 'deep', 'root')
87-
).fsPath
85+
const mockDvcSubRoot1 = Uri.file(join(mockDvcMonoRepo, 'data')).fsPath
86+
const mockDvcSubRoot2 = Uri.file(join(mockDvcMonoRepo, '.dvc')).fsPath
8887

8988
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, mockDvcSubRoot1)
9089
await configUpdated
@@ -117,7 +116,7 @@ suite('Config Test Suite', () => {
117116
expect(
118117
config.getFocusedProjects(),
119118
'should be able to focus multiple sub-projects'
120-
).to.deep.equal([mockDvcSubRoot1, mockDvcSubRoot2])
119+
).to.deep.equal([mockDvcSubRoot1, mockDvcSubRoot2].sort())
121120
expect(setupTriggeredCount).to.equal(2)
122121

123122
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, [
@@ -129,7 +128,7 @@ suite('Config Test Suite', () => {
129128
expect(
130129
config.getFocusedProjects(),
131130
'should not call setup if the value(s) inside of the option have not changed'
132-
).to.deep.equal([mockDvcSubRoot1, mockDvcSubRoot2])
131+
).to.deep.equal([mockDvcSubRoot1, mockDvcSubRoot2].sort())
133132
expect(setupTriggeredCount).to.equal(2)
134133

135134
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, [
@@ -142,7 +141,7 @@ suite('Config Test Suite', () => {
142141
expect(
143142
config.getFocusedProjects(),
144143
'should be able to focus multiple sub-projects along with the monorepo root'
145-
).to.deep.equal([mockDvcMonoRepo, mockDvcSubRoot1, mockDvcSubRoot2])
144+
).to.deep.equal([mockDvcMonoRepo, mockDvcSubRoot1, mockDvcSubRoot2].sort())
146145
expect(setupTriggeredCount).to.equal(3)
147146

148147
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, undefined)
@@ -165,11 +164,7 @@ suite('Config Test Suite', () => {
165164

166165
mockGetWorkspaceFolders.restore()
167166

168-
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, [
169-
mockDvcSubRoot2,
170-
mockDvcSubRoot1,
171-
mockDvcMonoRepo
172-
])
167+
await setConfigValue(ConfigKey.FOCUSED_PROJECTS, ['a', 'b', 'c'])
173168
await configUpdated
174169

175170
expect(

extension/src/test/suite/setup/index.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ suite('Setup Test Suite', () => {
191191
const messageSent = new Promise(resolve =>
192192
mockSendMessage.callsFake(data => {
193193
resolve(undefined)
194-
return mockSendMessage.wrappedMethod(data)
194+
return Promise.resolve(!!data)
195195
})
196196
)
197197

@@ -227,7 +227,7 @@ suite('Setup Test Suite', () => {
227227
const messageSent = new Promise(resolve =>
228228
mockSendMessage.callsFake(data => {
229229
resolve(undefined)
230-
return mockSendMessage.wrappedMethod(data)
230+
return Promise.resolve(!!data)
231231
})
232232
)
233233

@@ -268,7 +268,7 @@ suite('Setup Test Suite', () => {
268268
const messageSent = new Promise(resolve =>
269269
mockSendMessage.callsFake(data => {
270270
resolve(undefined)
271-
return mockSendMessage.wrappedMethod(data)
271+
return Promise.resolve(!!data)
272272
})
273273
)
274274

0 commit comments

Comments
 (0)