Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
deno
提交
49e04fb2
D
deno
项目概览
张重言
/
deno
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
deno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
49e04fb2
编写于
10月 29, 2019
作者:
A
Andy Hayden
提交者:
Ry Dahl
10月 29, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix race condition in test http server (#3237)
上级
0d41b10a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
14 deletion
+17
-14
cli/test_util.rs
cli/test_util.rs
+9
-6
tools/http_server.py
tools/http_server.py
+8
-8
未找到文件。
cli/test_util.rs
浏览文件 @
49e04fb2
...
...
@@ -8,6 +8,7 @@
use
std
::
path
::
PathBuf
;
use
std
::
process
::
Child
;
use
std
::
process
::
Command
;
use
std
::
process
::
Stdio
;
use
std
::
sync
::
Mutex
;
use
std
::
sync
::
MutexGuard
;
...
...
@@ -62,16 +63,18 @@ pub fn http_server<'a>() -> HttpServerGuard<'a> {
let
g
=
GUARD
.lock
()
.unwrap
();
println!
(
"tools/http_server.py starting..."
);
let
child
=
Command
::
new
(
"python"
)
let
mut
child
=
Command
::
new
(
"python"
)
.current_dir
(
root_path
())
.arg
(
"tools/http_server.py"
)
.args
(
&
[
"-u"
,
"tools/http_server.py"
])
.stdout
(
Stdio
::
piped
())
.spawn
()
.expect
(
"failed to execute child"
);
// Wait 1 second for the server to come up. TODO(ry) this is Racy.
std
::
thread
::
sleep
(
std
::
time
::
Duration
::
from_secs
(
2
));
println!
(
"tools/http_server.py ready"
);
let
stdout
=
child
.stdout
.as_mut
()
.unwrap
();
use
std
::
io
::{
BufRead
,
BufReader
};
let
mut
lines
=
BufReader
::
new
(
stdout
)
.lines
();
let
line
=
lines
.next
()
.unwrap
()
.unwrap
();
assert
!
(
line
.starts_with
(
"ready"
));
HttpServerGuard
{
child
,
g
}
}
tools/http_server.py
浏览文件 @
49e04fb2
...
...
@@ -178,20 +178,20 @@ def spawn():
while
any
(
not
s
.
thread
.
is_alive
()
for
s
in
servers
):
sleep
(
0.01
)
try
:
yield
print
"ready"
yield
servers
finally
:
for
s
in
servers
:
s
.
server
.
shutdown
()
def
main
():
servers
=
(
server
(),
redirect_server
(),
another_redirect_server
(),
double_redirects_server
(),
inf_redirects_server
())
try
:
while
all
(
s
.
thread
.
is_alive
()
for
s
in
servers
):
sleep
(
10
)
except
KeyboardInterrupt
:
pass
with
spawn
()
as
servers
:
try
:
while
all
(
s
.
thread
.
is_alive
()
for
s
in
servers
):
sleep
(
1
)
except
KeyboardInterrupt
:
pass
sys
.
exit
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录