From 09d2577dcddb2c77932abe24a4683efec6c7b5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AF=A3=E6=9E=81=20=28=20y=C3=AC=20j=C3=AD=20=29?=
 <517618650@qq.com>
Date: Tue, 13 Feb 2018 13:34:11 +0800
Subject: [PATCH] fixed travis-ci failed because of test cases. (#1370)

---
 .../dubbo/rpc/protocol/thrift/AbstractTest.java | 17 +++++++++++++++--
 .../rpc/protocol/thrift/ThriftProtocolTest.java |  3 ++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java
index 8500f10ca73..742e1a5d44e 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java
@@ -18,6 +18,7 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub;
@@ -36,7 +37,7 @@
 
 public abstract class AbstractTest {
 
-    static final int PORT = 30660;
+    protected int PORT = NetUtils.getAvailablePort();
 
     protected TServer server;
 
@@ -44,8 +45,11 @@ public abstract class AbstractTest {
 
     protected Invoker<?> invoker;
 
+    TServerTransport serverTransport;
+
     protected void init() throws Exception {
-        TServerTransport serverTransport = new TServerSocket(PORT);
+
+        serverTransport = new TServerSocket(PORT);
 
         TBinaryProtocol.Factory bFactory = new TBinaryProtocol.Factory();
 
@@ -98,6 +102,15 @@ protected void destroy() throws Exception {
             invoker = null;
         }
 
+        try{
+            if(serverTransport != null){
+                // release port if used
+                serverTransport.close();
+            }
+        }catch (Exception e) {
+            // ignore
+        }
+
     }
 
     protected TTransportFactory getTransportFactory() {
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
index 861091a9f8b..45e8bdc903a 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java
@@ -17,6 +17,7 @@
 package com.alibaba.dubbo.rpc.protocol.thrift;
 
 import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.gen.dubbo.Demo;
 
@@ -25,7 +26,7 @@
 
 public class ThriftProtocolTest extends AbstractTest {
 
-    public static final int DEFAULT_PORT = 30660;
+    public final int DEFAULT_PORT = NetUtils.getAvailablePort();
 
     private ThriftProtocol protocol;