Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9bdcd610
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9bdcd610
编写于
1月 07, 2019
作者:
J
João Moreno
提交者:
GitHub
1月 07, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #65941 from Microsoft/kieferrm/smoke-test-shutdown
Gentle shutdown of application in smoke test
上级
c4a1b80e
26ed89df
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
3 deletion
+16
-3
src/vs/platform/driver/electron-main/driver.ts
src/vs/platform/driver/electron-main/driver.ts
+4
-0
src/vs/platform/driver/node/driver.ts
src/vs/platform/driver/node/driver.ts
+6
-0
test/smoke/src/application.ts
test/smoke/src/application.ts
+1
-0
test/smoke/src/vscode/code.ts
test/smoke/src/vscode/code.ts
+5
-3
未找到文件。
src/vs/platform/driver/electron-main/driver.ts
浏览文件 @
9bdcd610
...
...
@@ -71,6 +71,10 @@ export class Driver implements IDriver, IWindowDriverRegistry {
this
.
windowsService
.
reload
(
window
);
}
async
exitApplication
():
Promise
<
void
>
{
return
this
.
windowsService
.
quit
();
}
async
dispatchKeybinding
(
windowId
:
number
,
keybinding
:
string
):
Promise
<
void
>
{
await
this
.
whenUnfrozen
(
windowId
);
...
...
src/vs/platform/driver/node/driver.ts
浏览文件 @
9bdcd610
...
...
@@ -30,6 +30,7 @@ export interface IDriver {
getWindowIds
():
Promise
<
number
[]
>
;
capturePage
(
windowId
:
number
):
Promise
<
string
>
;
reloadWindow
(
windowId
:
number
):
Promise
<
void
>
;
exitApplication
():
Promise
<
void
>
;
dispatchKeybinding
(
windowId
:
number
,
keybinding
:
string
):
Promise
<
void
>
;
click
(
windowId
:
number
,
selector
:
string
,
xoffset
?:
number
|
undefined
,
yoffset
?:
number
|
undefined
):
Promise
<
void
>
;
doubleClick
(
windowId
:
number
,
selector
:
string
):
Promise
<
void
>
;
...
...
@@ -56,6 +57,7 @@ export class DriverChannel implements IServerChannel {
case
'
getWindowIds
'
:
return
this
.
driver
.
getWindowIds
();
case
'
capturePage
'
:
return
this
.
driver
.
capturePage
(
arg
);
case
'
reloadWindow
'
:
return
this
.
driver
.
reloadWindow
(
arg
);
case
'
exitApplication
'
:
return
this
.
driver
.
exitApplication
();
case
'
dispatchKeybinding
'
:
return
this
.
driver
.
dispatchKeybinding
(
arg
[
0
],
arg
[
1
]);
case
'
click
'
:
return
this
.
driver
.
click
(
arg
[
0
],
arg
[
1
],
arg
[
2
],
arg
[
3
]);
case
'
doubleClick
'
:
return
this
.
driver
.
doubleClick
(
arg
[
0
],
arg
[
1
]);
...
...
@@ -90,6 +92,10 @@ export class DriverChannelClient implements IDriver {
return
this
.
channel
.
call
(
'
reloadWindow
'
,
windowId
);
}
exitApplication
():
Promise
<
void
>
{
return
this
.
channel
.
call
(
'
exitApplication
'
);
}
dispatchKeybinding
(
windowId
:
number
,
keybinding
:
string
):
Promise
<
void
>
{
return
this
.
channel
.
call
(
'
dispatchKeybinding
'
,
[
windowId
,
keybinding
]);
}
...
...
test/smoke/src/application.ts
浏览文件 @
9bdcd610
...
...
@@ -89,6 +89,7 @@ export class Application {
async
stop
():
Promise
<
any
>
{
if
(
this
.
_code
)
{
await
this
.
_code
.
exit
();
this
.
_code
.
dispose
();
this
.
_code
=
undefined
;
}
...
...
test/smoke/src/vscode/code.ts
浏览文件 @
9bdcd610
...
...
@@ -64,7 +64,7 @@ async function connect(child: cp.ChildProcess, outPath: string, handlePath: stri
while
(
true
)
{
try
{
const
{
client
,
driver
}
=
await
connectDriver
(
outPath
,
handlePath
);
return
new
Code
(
c
hild
,
c
lient
,
driver
,
logger
);
return
new
Code
(
client
,
driver
,
logger
);
}
catch
(
err
)
{
if
(
++
errCount
>
50
)
{
child
.
kill
();
...
...
@@ -188,7 +188,6 @@ export class Code {
private
driver
:
IDriver
;
constructor
(
private
process
:
cp
.
ChildProcess
,
private
client
:
IDisposable
,
driver
:
IDriver
,
readonly
logger
:
Logger
...
...
@@ -230,6 +229,10 @@ export class Code {
await
this
.
driver
.
reloadWindow
(
windowId
);
}
async
exit
():
Promise
<
void
>
{
await
this
.
driver
.
exitApplication
();
}
async
waitForTextContent
(
selector
:
string
,
textContent
?:
string
,
accept
?:
(
result
:
string
)
=>
boolean
):
Promise
<
string
>
{
const
windowId
=
await
this
.
getActiveWindowId
();
accept
=
accept
||
(
result
=>
textContent
!==
undefined
?
textContent
===
result
:
!!
result
);
...
...
@@ -302,7 +305,6 @@ export class Code {
dispose
():
void
{
this
.
client
.
dispose
();
this
.
process
.
kill
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录