Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade 3.0.0-SNAPSHOT #92

Merged
merged 12 commits into from
Oct 31, 2018
Merged

Upgrade 3.0.0-SNAPSHOT #92

merged 12 commits into from
Oct 31, 2018

Conversation

QilongZhang
Copy link
Contributor

Upgrade 2.3.0-SNAPSHOT

@QilongZhang QilongZhang added this to the 2.3.0 milestone Oct 19, 2018
@@ -2,7 +2,7 @@ language: java
sudo: false

jdk:
- openjdk7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里 JDK7 和 JDK8 都保留吧,历史的组件还没有升级上来,所以两种测试场景都保留吧。

@QilongZhang QilongZhang requested a review from glmapper October 31, 2018 07:11
@QilongZhang QilongZhang changed the title Upgrade 2.3.0-SNAPSHOT Upgrade 3.0.0-SNAPSHOT Oct 31, 2018
@@ -182,7 +182,7 @@ public void testDoServerReport() throws Exception {
//ss TL
this.remoteTracer.serverSend("0");
//异步汇报,所以 sleep 10s
Thread.sleep(1000 * 10);
Thread.sleep(1000);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

代码改掉,这个注释也改下吧

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗯,已改~

@@ -225,7 +225,7 @@ public void testDoReport() throws Exception {
//ss TL
this.remoteTracer.serverSend("0");
//异步汇报,所以 sleep 10s
Thread.sleep(1000 * 10);
Thread.sleep(1000);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

注释需要修改

String fromApp = "client";
String toApp = "server";
String fromApp = "server";
String toApp = "client";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的修改 fromApp & toApp 的 位置是什么原因?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

对着之前的测试代码逻辑看下,改完之后是对的~

@QilongZhang QilongZhang modified the milestones: 2.3.0, 3.0.0 Oct 31, 2018
@QilongZhang QilongZhang changed the base branch from 2.3.x to 3.x October 31, 2018 08:53
@glmapper glmapper merged commit ffbd140 into sofastack:3.x Oct 31, 2018
@QilongZhang QilongZhang deleted the upgrade_2_3_0 branch November 16, 2018 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants