Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
2ebd9ca0
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ebd9ca0
编写于
2月 24, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix test failure
上级
67dfdcd7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
16 deletion
+1
-16
cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
.../report/page/transaction/TransactionReportMergeResult.xml
+1
-11
cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportOld.xml
...ping/cat/report/page/transaction/TransactionReportOld.xml
+0
-5
未找到文件。
cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
浏览文件 @
2ebd9ca0
<transaction-report
domain=
"Cat"
startTime=
"2012-02-16 23:00:00"
endTime=
"2012-02-16 23:59:00"
>
<domain>
Cat
</domain>
<<<<<<
< HEAD:cat-home
/src/test/resources/com/dianping/cat/report/tool/TransactionReportMergeResult.xml
<type
id=
"URL"
totalCount=
"22"
failCount=
"0"
failPercent=
"0.00"
min=
"0.0"
max=
"194.0"
avg=
"47.1"
sum=
"1036.0"
sum2=
"147884.0"
std=
"67.1"
>
=======
<type
id=
"URL"
totalCount=
"22"
failCount=
"4"
failPercent=
"18.18"
min=
"0.0"
max=
"194.0"
avg=
"47.1"
sum=
"1036.0"
sum2=
"147884.0"
std=
"67.1"
>
>>>>>>> 4eeaaceb4535ac3dd3133176a1c2222e14bc15e0:cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
<name
id=
"home"
totalCount=
"2"
failCount=
"0"
failPercent=
"0.00"
min=
"175.0"
max=
"175.0"
avg=
"175.0"
sum=
"350.0"
sum2=
"61250.0"
std=
"0.0"
>
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
...
...
@@ -29,19 +25,13 @@
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
</name>
<<<<<<
< HEAD:cat-home
/src/test/resources/com/dianping/cat/report/tool/TransactionReportMergeResult.xml
<name
id=
"TransitionPhase"
totalCount=
"22"
failCount=
"0"
failPercent=
"0.00"
min=
"0.0"
max=
"1234.0"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
std=
"0.0"
>
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
</name>
<name
id=
"OutboundPhase"
totalCount=
"22"
failCount=
"
0"
failPercent=
"0.00
"
min=
"1.0"
max=
"191.0"
avg=
"43.8"
sum=
"964.0"
sum2=
"136176.0"
std=
"65.3"
>
<name
id=
"OutboundPhase"
totalCount=
"22"
failCount=
"
7"
failPercent=
"31.82
"
min=
"1.0"
max=
"191.0"
avg=
"43.8"
sum=
"964.0"
sum2=
"136176.0"
std=
"65.3"
>
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
=======
<name
id=
"TransitionPhase"
totalCount=
"22"
failCount=
"4"
failPercent=
"18.18"
min=
"0.0"
max=
"4.9E-324"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
std=
"0.0"
>
</name>
<name
id=
"OutboundPhase"
totalCount=
"22"
failCount=
"7"
failPercent=
"31.82"
min=
"1.0"
max=
"191.0"
avg=
"43.8"
sum=
"964.0"
sum2=
"136176.0"
std=
"65.3"
>
>>>>>>> 4eeaaceb4535ac3dd3133176a1c2222e14bc15e0:cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportMergeResult.xml
</name>
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
...
...
cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportOld.xml
浏览文件 @
2ebd9ca0
...
...
@@ -34,13 +34,8 @@
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
</name>
<<<<<<
< HEAD:cat-home
/src/test/resources/com/dianping/cat/report/tool/TransactionReportOld.xml
<name
id=
"TransitionPhase"
totalCount=
"11"
failCount=
"0"
failPercent=
"0.00"
min=
"0.0"
max=
"1234"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
=======
<name
id=
"TransitionPhase"
totalCount=
"11"
failCount=
"4"
failPercent=
"0.00"
min=
"0.0"
max=
"4.9E-324"
avg=
"0.0"
sum=
"0.0"
sum2=
"0.0"
>
>>>>>> 4eeaaceb4535ac3dd3133176a1c2222e14bc15e0:cat-home/src/test/resources/com/dianping/cat/report/page/transaction/TransactionReportOld.xml
std=
"0.0"
>
<successMessageUrl>
20120216/23/Cat/1168a02c-664b-440c-9ef4-a87bac4d9cb1.html
</successMessageUrl>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录