Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
dc73585b
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dc73585b
编写于
2月 24, 2016
作者:
J
Jared Parsons
提交者:
Jared Parsons
3月 01, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make IDataStorage async
In preparation for moving to web storage.
上级
6eeb7637
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
58 addition
and
17 deletion
+58
-17
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
+14
-12
src/Tools/Source/RunTests/Cache/IDataStorage.cs
src/Tools/Source/RunTests/Cache/IDataStorage.cs
+2
-2
src/Tools/Source/RunTests/Cache/LocalDataStorage.cs
src/Tools/Source/RunTests/Cache/LocalDataStorage.cs
+17
-3
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
+24
-0
src/Tools/Source/RunTests/RunTests.csproj
src/Tools/Source/RunTests/RunTests.csproj
+1
-0
未找到文件。
src/Tools/Source/RunTests/Cache/CachingTestExecutor.cs
浏览文件 @
dc73585b
...
...
@@ -36,21 +36,23 @@ public async Task<TestResult> RunTestAsync(string assemblyPath, CancellationToke
builder
.
AppendLine
(
"==="
);
Logger
.
Log
(
builder
.
ToString
());
TestResult
testResult
;
CachedTestResult
cachedTestResult
;
if
(!
_dataStorage
.
TryGetCachedTestResult
(
contentFile
.
Checksum
,
out
cachedTestResult
))
try
{
Logger
.
Log
(
$"
{
Path
.
GetFileName
(
assemblyPath
)}
- running"
);
testResult
=
await
_testExecutor
.
RunTestAsync
(
assemblyPath
,
cancellationToken
);
Logger
.
Log
(
$"
{
Path
.
GetFileName
(
assemblyPath
)}
- caching"
);
CacheTestResult
(
contentFile
,
testResult
);
}
else
var
cachedTestResult
=
await
_dataStorage
.
TryGetCachedTestResult
(
contentFile
.
Checksum
);
if
(
cachedTestResult
.
HasValue
)
{
testResult
=
Migrate
(
assemblyPath
,
cachedTestResult
);
Logger
.
Log
(
$"
{
Path
.
GetFileName
(
assemblyPath
)}
- cache hit"
);
return
Migrate
(
assemblyPath
,
cachedTestResult
.
Value
);
}
}
catch
(
Exception
ex
)
{
Logger
.
Log
(
$"Error reading cache
{
ex
}
"
);
}
Logger
.
Log
(
$"
{
Path
.
GetFileName
(
assemblyPath
)}
- running"
);
var
testResult
=
await
_testExecutor
.
RunTestAsync
(
assemblyPath
,
cancellationToken
);
await
CacheTestResult
(
contentFile
,
testResult
).
ConfigureAwait
(
true
);
return
testResult
;
}
...
...
@@ -77,7 +79,7 @@ private TestResult Migrate(string assemblyPath, CachedTestResult cachedTestResul
errorOutput
:
cachedTestResult
.
ErrorOutput
);
}
private
void
CacheTestResult
(
ContentFile
contentFile
,
TestResult
testResult
)
private
async
Task
CacheTestResult
(
ContentFile
contentFile
,
TestResult
testResult
)
{
try
{
...
...
@@ -88,7 +90,7 @@ private void CacheTestResult(ContentFile contentFile, TestResult testResult)
errorOutput
:
testResult
.
ErrorOutput
,
resultsFileName
:
Path
.
GetFileName
(
testResult
.
ResultsFilePath
),
resultsFileContent
:
resultFileContent
);
_dataStorage
.
AddCachedTestResult
(
contentFile
,
cachedTestResult
);
await
_dataStorage
.
AddCachedTestResult
(
contentFile
,
cachedTestResult
).
ConfigureAwait
(
true
);
}
catch
(
Exception
ex
)
{
...
...
src/Tools/Source/RunTests/Cache/IDataStorage.cs
浏览文件 @
dc73585b
...
...
@@ -10,9 +10,9 @@ namespace RunTests.Cache
{
internal
interface
IDataStorage
{
bool
TryGetCachedTestResult
(
string
checksum
,
out
CachedTestResult
testResult
);
Task
<
CachedTestResult
?>
TryGetCachedTestResult
(
string
checksum
);
void
AddCachedTestResult
(
ContentFile
conentFile
,
CachedTestResult
testResult
);
Task
AddCachedTestResult
(
ContentFile
conentFile
,
CachedTestResult
testResult
);
}
internal
struct
CachedTestResult
...
...
src/Tools/Source/RunTests/Cache/LocalDataStorage.cs
浏览文件 @
dc73585b
...
...
@@ -35,6 +35,18 @@ internal LocalDataStorage(string storagePath = null)
_storagePath
=
storagePath
??
Path
.
Combine
(
Environment
.
GetFolderPath
(
Environment
.
SpecialFolder
.
LocalApplicationData
),
DirectoryName
);
}
public
Task
<
CachedTestResult
?>
TryGetCachedTestResult
(
string
checksum
)
{
CachedTestResult
testResult
;
CachedTestResult
?
value
=
null
;
if
(
TryGetCachedTestResult
(
checksum
,
out
testResult
))
{
value
=
testResult
;
}
return
Task
.
FromResult
(
value
);
}
public
bool
TryGetCachedTestResult
(
string
checksum
,
out
CachedTestResult
testResult
)
{
testResult
=
default
(
CachedTestResult
);
...
...
@@ -70,7 +82,7 @@ public bool TryGetCachedTestResult(string checksum, out CachedTestResult testRes
return
false
;
}
public
void
AddCachedTestResult
(
ContentFile
contentFile
,
CachedTestResult
testResult
)
public
Task
AddCachedTestResult
(
ContentFile
contentFile
,
CachedTestResult
testResult
)
{
var
checksum
=
contentFile
.
Checksum
;
var
storagePath
=
Path
.
Combine
(
_storagePath
,
checksum
);
...
...
@@ -78,7 +90,7 @@ public void AddCachedTestResult(ContentFile contentFile, CachedTestResult testRe
{
if
(!
FileUtil
.
EnsureDirectory
(
storagePath
))
{
return
;
return
Task
.
FromResult
(
true
)
;
}
Write
(
checksum
,
StorageKind
.
ExitCode
,
testResult
.
ExitCode
.
ToString
());
...
...
@@ -94,6 +106,8 @@ public void AddCachedTestResult(ContentFile contentFile, CachedTestResult testRe
Logger
.
Log
(
$"Failed to log
{
checksum
}
{
e
.
Message
}
"
);
FileUtil
.
DeleteDirectory
(
storagePath
);
}
return
Task
.
FromResult
(
true
);
}
private
string
GetStorageFolder
(
string
checksum
)
...
...
src/Tools/Source/RunTests/Cache/WebDataStorage.cs
0 → 100644
浏览文件 @
dc73585b
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
System.Collections.Generic
;
using
System.IO
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
RunTests.Cache
{
internal
sealed
class
WebDataStorage
:
IDataStorage
{
public
Task
AddCachedTestResult
(
ContentFile
conentFile
,
CachedTestResult
testResult
)
{
throw
new
NotImplementedException
();
}
public
Task
<
CachedTestResult
?>
TryGetCachedTestResult
(
string
checksum
)
{
throw
new
NotImplementedException
();
}
}
}
src/Tools/Source/RunTests/RunTests.csproj
浏览文件 @
dc73585b
...
...
@@ -26,6 +26,7 @@
<Compile
Include=
"Cache\ContentUtil.cs"
/>
<Compile
Include=
"Cache\CachingTestExecutor.cs"
/>
<Compile
Include=
"Cache\ConentFile.cs"
/>
<Compile
Include=
"Cache\WebDataStorage.cs"
/>
<Compile
Include=
"Constants.cs"
/>
<Compile
Include=
"FileUtil.cs"
/>
<Compile
Include=
"Cache\IDataStorage.cs"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录